proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 21:01:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refdb: refactor the lockfile cleanup

Browse Source 
We can reduce the duplication by cleaning up at the beginning of the
loop, since it's something we want to do every time we continue.
This commit is contained in:
Carlos Martín Nieto 2015-12-24 17:38:41 +00:00
parent 7ea4710ae3
commit dd1ca6f15a
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/refdb_fs.c
View File

@ -901,6 +901,7 @@ static int packed_write_ref(struct packref *ref, git_filebuf *file)
static int packed_remove_loose(refdb_fs_backend *backend) static int packed_remove_loose(refdb_fs_backend *backend)
{ {
size_t i; size_t i;
git_filebuf lock = GIT_FILEBUF_INIT;
git_buf ref_content = GIT_BUF_INIT; git_buf ref_content = GIT_BUF_INIT;
int error = 0; int error = 0;
@ -908,12 +909,13 @@ static int packed_remove_loose(refdb_fs_backend *backend)
for (i = 0; i < git_sortedcache_entrycount(backend->refcache); ++i) { for (i = 0; i < git_sortedcache_entrycount(backend->refcache); ++i) {
struct packref *ref = git_sortedcache_entry(backend->refcache, i); struct packref *ref = git_sortedcache_entry(backend->refcache, i);
git_filebuf lock = GIT_FILEBUF_INIT;
git_oid current_id; git_oid current_id;
if (!ref || !(ref->flags & PACKREF_WAS_LOOSE)) if (!ref || !(ref->flags & PACKREF_WAS_LOOSE))
continue; continue;
git_filebuf_cleanup(&lock);
/* We need to stop anybody from updating the ref while we try to do a safe delete */ /* We need to stop anybody from updating the ref while we try to do a safe delete */
error = loose_lock(&lock, backend, ref->name); error = loose_lock(&lock, backend, ref->name);
/* If someone else is updating it, let them do it */ /* If someone else is updating it, let them do it */
@ -927,28 +929,20 @@ static int packed_remove_loose(refdb_fs_backend *backend)
error = git_futils_readbuffer(&ref_content, lock.path_original); error = git_futils_readbuffer(&ref_content, lock.path_original);
/* Someone else beat us to cleaning up the ref, let's simply continue */ /* Someone else beat us to cleaning up the ref, let's simply continue */
if (error == GIT_ENOTFOUND) { if (error == GIT_ENOTFOUND)
git_filebuf_cleanup(&lock);
continue; continue;
}
/* This became a symref between us packing and trying to delete it, so ignore it */ /* This became a symref between us packing and trying to delete it, so ignore it */
if (!git__prefixcmp(ref_content.ptr, GIT_SYMREF)) { if (!git__prefixcmp(ref_content.ptr, GIT_SYMREF))
git_filebuf_cleanup(&lock);
continue; continue;
}
/* Figure out the current id; if we fail record it but don't fail the whole operation */ /* Figure out the current id; if we find a bad ref file, skip it so we can do the rest */
if ((error = loose_parse_oid(&current_id, lock.path_original, &ref_content)) < 0) { if (loose_parse_oid(&current_id, lock.path_original, &ref_content) < 0)
git_filebuf_cleanup(&lock);
continue; continue;
}
/* If the ref moved since we packed it, we must not delete it */ /* If the ref moved since we packed it, we must not delete it */
if (!git_oid_equal(&current_id, &ref->oid)) { if (!git_oid_equal(&current_id, &ref->oid))
git_filebuf_cleanup(&lock);
continue; continue;
}
/* /*
* if we fail to remove a single file, this is *not* good, * if we fail to remove a single file, this is *not* good,
@ -957,9 +951,9 @@ static int packed_remove_loose(refdb_fs_backend *backend)
* we haven't lost information. * we haven't lost information.
*/ */
p_unlink(lock.path_original); p_unlink(lock.path_original);
git_filebuf_cleanup(&lock);
} }
git_filebuf_cleanup(&lock);
return 0; return 0;
} }