Commit 2a5ad7d0f2c28337530855fae250f85123070fcb
2017-02-17T16:42:40
fsync: call it "synchronous" object writing Rename `GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION` -> `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION`.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204
diff --git a/include/git2/common.h b/include/git2/common.h
index f5d37ed..c909f86 100644
--- a/include/git2/common.h
+++ b/include/git2/common.h
@@ -179,7 +179,7 @@ typedef enum {
GIT_OPT_SET_SSL_CIPHERS,
GIT_OPT_GET_USER_AGENT,
GIT_OPT_ENABLE_OFS_DELTA,
- GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION,
+ GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION,
} git_libgit2_opt_t;
/**
@@ -317,7 +317,7 @@ typedef enum {
* > Packfiles containing offset deltas can still be read.
* > This defaults to enabled.
*
- * * opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, int enabled)
+ * * opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, int enabled)
*
* > Enable synchronized writes of new objects using `fsync`
* > (or the platform equivalent) to ensure that new object data
diff --git a/src/indexer.c b/src/indexer.c
index 9510253..3fd7223 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -991,7 +991,7 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
if (git_filebuf_open(&index_file, filename.ptr,
GIT_FILEBUF_HASH_CONTENTS |
- (git_object__synchronized_writing ? GIT_FILEBUF_FSYNC : 0),
+ (git_object__synchronous_writing ? GIT_FILEBUF_FSYNC : 0),
idx->mode) < 0)
goto on_error;
@@ -1069,7 +1069,7 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
return -1;
}
- if (git_object__synchronized_writing && p_fsync(idx->pack->mwf.fd) < 0) {
+ if (git_object__synchronous_writing && p_fsync(idx->pack->mwf.fd) < 0) {
giterr_set(GITERR_OS, "failed to fsync packfile");
goto on_error;
}
@@ -1090,7 +1090,7 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
goto on_error;
/* And fsync the parent directory if we're asked to. */
- if (git_object__synchronized_writing &&
+ if (git_object__synchronous_writing &&
git_futils_fsync_parent(git_buf_cstr(&filename)) < 0)
goto on_error;
diff --git a/src/object.c b/src/object.c
index c92adbb..bd87c93 100644
--- a/src/object.c
+++ b/src/object.c
@@ -16,7 +16,7 @@
#include "tag.h"
bool git_object__strict_input_validation = true;
-bool git_object__synchronized_writing = false;
+bool git_object__synchronous_writing = false;
typedef struct {
const char *str; /* type name string */
diff --git a/src/object.h b/src/object.h
index 7d94d8b..13117e4 100644
--- a/src/object.h
+++ b/src/object.h
@@ -10,7 +10,7 @@
#include "repository.h"
extern bool git_object__strict_input_validation;
-extern bool git_object__synchronized_writing;
+extern bool git_object__synchronous_writing;
/** Base git object for inheritance */
struct git_object {
diff --git a/src/odb_loose.c b/src/odb_loose.c
index 5a80b7a..e14af4f 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -844,7 +844,7 @@ static int filebuf_flags(loose_backend *backend)
int flags = GIT_FILEBUF_TEMPORARY |
(backend->object_zlib_level << GIT_FILEBUF_DEFLATE_SHIFT);
- if (backend->fsync_object_files || git_object__synchronized_writing)
+ if (backend->fsync_object_files || git_object__synchronous_writing)
flags |= GIT_FILEBUF_FSYNC;
return flags;
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index fac5ba5..d7a458a 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -756,7 +756,7 @@ static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char *
return -1;
filebuf_flags = GIT_FILEBUF_FORCE;
- if (git_object__synchronized_writing)
+ if (git_object__synchronous_writing)
filebuf_flags |= GIT_FILEBUF_FSYNC;
error = git_filebuf_open(file, ref_path.ptr, filebuf_flags, GIT_REFS_FILE_MODE);
@@ -1001,7 +1001,7 @@ static int packed_write(refdb_fs_backend *backend)
if ((error = git_sortedcache_wlock(refcache)) < 0)
return error;
- if (git_object__synchronized_writing)
+ if (git_object__synchronous_writing)
open_flags = GIT_FILEBUF_FSYNC;
/* Open the file! */
@@ -1861,7 +1861,7 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
open_flags = O_WRONLY | O_CREAT | O_APPEND;
- if (git_object__synchronized_writing)
+ if (git_object__synchronous_writing)
open_flags |= O_FSYNC;
error = git_futils_writebuffer(&buf, git_buf_cstr(&path), open_flags, GIT_REFLOG_FILE_MODE);
diff --git a/src/settings.c b/src/settings.c
index f3120ff..24e549e 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -227,8 +227,8 @@ int git_libgit2_opts(int key, ...)
git_smart__ofs_delta_enabled = (va_arg(ap, int) != 0);
break;
- case GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION:
- git_object__synchronized_writing = (va_arg(ap, int) != 0);
+ case GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION:
+ git_object__synchronous_writing = (va_arg(ap, int) != 0);
break;
default:
diff --git a/tests/odb/loose.c b/tests/odb/loose.c
index 43dabcb..fd4a538 100644
--- a/tests/odb/loose.c
+++ b/tests/odb/loose.c
@@ -62,7 +62,7 @@ void test_odb_loose__initialize(void)
void test_odb_loose__cleanup(void)
{
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 0));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 0));
cl_fixture_cleanup("test-objects");
}
@@ -180,7 +180,7 @@ void test_odb_loose__fsync_obeys_odb_option(void)
void test_odb_loose__fsync_obeys_global_setting(void)
{
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 1));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 1));
write_object_to_loose_odb(0);
cl_assert(p_fsync__cnt > 0);
}
diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c
index 77f61f7..96d643a 100644
--- a/tests/pack/packbuilder.c
+++ b/tests/pack/packbuilder.c
@@ -31,7 +31,7 @@ void test_pack_packbuilder__cleanup(void)
git_oid *o;
unsigned int i;
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 0));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 0));
if (_commits_is_initialized) {
_commits_is_initialized = 0;
@@ -200,7 +200,7 @@ void test_pack_packbuilder__does_not_fsync_by_default(void)
void test_pack_packbuilder__fsync_when_asked(void)
{
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 1));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 1));
p_fsync__cnt = 0;
seed_packbuilder();
git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
diff --git a/tests/refs/create.c b/tests/refs/create.c
index e9630e8..fdbef9f 100644
--- a/tests/refs/create.c
+++ b/tests/refs/create.c
@@ -22,7 +22,7 @@ void test_refs_create__cleanup(void)
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1));
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION, 1));
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 0));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 0));
}
void test_refs_create__symbolic(void)
@@ -323,7 +323,7 @@ void test_refs_create__fsyncs_when_requested(void)
git_refdb *refdb;
git_oid id;
- cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 1));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION, 1));
p_fsync__cnt = 0;
git_oid_fromstr(&id, current_master_tip);