Instead of using a global `lock_file` instance for the main
"packed-refs" file and using a pointer in `files_ref_store` to keep
track of whether it is locked, embed the `lock_file` instance directly
in the `files_ref_store` struct and use the new
`is_lock_file_locked()` function to keep track of whether it is
locked. This keeps related data together and makes the main reference
store less of a special case.
Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
refs/files-backend.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index e7ae5538cc..ba0ad0aa44 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -63,16 +63,12 @@ struct files_ref_store {
struct packed_ref_cache *packed;
/*
- * Iff the packed-refs file associated with this instance is
- * currently locked for writing, this points at the associated
- * lock (which is owned by somebody else).
+ * Lock used for the "packed-refs" file. Note that this (and
+ * thus the enclosing `files_ref_store`) must not be freed.
*/
- struct lock_file *packlock;
+ struct lock_file packlock;
};
-/* Lock used for the main packed-refs file: */
-static struct lock_file packlock;
-
/*
* Increment the reference count of *packed_refs.
*/
@@ -102,7 +98,7 @@ static void clear_packed_ref_cache(struct files_ref_store
*refs)
if (refs->packed) {
struct packed_ref_cache *packed_refs = refs->packed;
- if (refs->packlock)
+ if (is_lock_file_locked(&refs->packlock))
die("internal error: packed-ref cache cleared while
locked");
refs->packed = NULL;
release_packed_ref_cache(packed_refs);
@@ -406,7 +402,7 @@ static void add_packed_ref(struct files_ref_store *refs,
{
struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
- if (!refs->packlock)
+ if (!is_lock_file_locked(&refs->packlock))
die("internal error: packed refs not locked");
add_ref_entry(get_packed_ref_dir(packed_ref_cache),
create_ref_entry(refname, sha1, REF_ISPACKED, 1));
@@ -1300,7 +1296,7 @@ static int lock_packed_refs(struct files_ref_store *refs,
int flags)
}
if (hold_lock_file_for_update_timeout(
- &packlock, files_packed_refs_path(refs),
+ &refs->packlock, files_packed_refs_path(refs),
flags, timeout_value) < 0)
return -1;
/*
@@ -1310,7 +1306,6 @@ static int lock_packed_refs(struct files_ref_store *refs,
int flags)
* the packed-refs file.
*/
packed_ref_cache = get_packed_ref_cache(refs);
- refs->packlock = &packlock;
/* Increment the reference count to prevent it from being freed: */
acquire_packed_ref_cache(packed_ref_cache);
return 0;
@@ -1333,10 +1328,10 @@ static int commit_packed_refs(struct files_ref_store
*refs)
files_assert_main_repository(refs, "commit_packed_refs");
- if (!refs->packlock)
+ if (!is_lock_file_locked(&refs->packlock))
die("internal error: packed-refs not locked");
- out = fdopen_lock_file(refs->packlock, "w");
+ out = fdopen_lock_file(&refs->packlock, "w");
if (!out)
die_errno("unable to fdopen packed-refs descriptor");
@@ -1354,11 +1349,10 @@ static int commit_packed_refs(struct files_ref_store
*refs)
if (ok != ITER_DONE)
die("error while iterating over references");
- if (commit_lock_file(refs->packlock)) {
+ if (commit_lock_file(&refs->packlock)) {
save_errno = errno;
error = -1;
}
- refs->packlock = NULL;
release_packed_ref_cache(packed_ref_cache);
errno = save_errno;
return error;
@@ -1376,10 +1370,9 @@ static void rollback_packed_refs(struct files_ref_store
*refs)
files_assert_main_repository(refs, "rollback_packed_refs");
- if (!refs->packlock)
+ if (!is_lock_file_locked(&refs->packlock))
die("internal error: packed-refs not locked");
- rollback_lock_file(refs->packlock);
- refs->packlock = NULL;
+ rollback_lock_file(&refs->packlock);
release_packed_ref_cache(packed_ref_cache);
clear_packed_ref_cache(refs);
}
--
2.11.0
