Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Concurrent ref iterator access #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2014
Merged

Concurrent ref iterator access #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ee2543
refs: failing test for concurrent ref access
carlosmn Jun 2, 2014
2d945f8
refs: copy the packed refs on iteration
carlosmn Jun 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/refdb_fs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ typedef struct {
git_pool pool;
git_vector loose;

git_sortedcache *cache;
size_t loose_pos;
size_t packed_pos;
} refdb_fs_iter;
Expand All @@ -468,6 +469,7 @@ static void refdb_fs_backend__iterator_free(git_reference_iterator *_iter)

git_vector_free(&iter->loose);
git_pool_clear(&iter->pool);
git_sortedcache_free(iter->cache);
git__free(iter);
}

Expand Down Expand Up @@ -539,10 +541,14 @@ static int refdb_fs_backend__iterator_next(
giterr_clear();
}

git_sortedcache_rlock(backend->refcache);
if (!iter->cache) {
if ((error = git_sortedcache_copy(&iter->cache, backend->refcache, 1, NULL, NULL)) < 0)
return error;
}

while (iter->packed_pos < git_sortedcache_entrycount(backend->refcache)) {
ref = git_sortedcache_entry(backend->refcache, iter->packed_pos++);
error = GIT_ITEROVER;
while (iter->packed_pos < git_sortedcache_entrycount(iter->cache)) {
ref = git_sortedcache_entry(iter->cache, iter->packed_pos++);
if (!ref) /* stop now if another thread deleted refs and we past end */
break;

Expand All @@ -556,7 +562,6 @@ static int refdb_fs_backend__iterator_next(
break;
}

git_sortedcache_runlock(backend->refcache);
return error;
}

Expand All @@ -579,10 +584,14 @@ static int refdb_fs_backend__iterator_next_name(
giterr_clear();
}

git_sortedcache_rlock(backend->refcache);
if (!iter->cache) {
if ((error = git_sortedcache_copy(&iter->cache, backend->refcache, 1, NULL, NULL)) < 0)
return error;
}

while (iter->packed_pos < git_sortedcache_entrycount(backend->refcache)) {
ref = git_sortedcache_entry(backend->refcache, iter->packed_pos++);
error = GIT_ITEROVER;
while (iter->packed_pos < git_sortedcache_entrycount(iter->cache)) {
ref = git_sortedcache_entry(iter->cache, iter->packed_pos++);
if (!ref) /* stop now if another thread deleted refs and we past end */
break;

Expand All @@ -596,7 +605,6 @@ static int refdb_fs_backend__iterator_next_name(
break;
}

git_sortedcache_runlock(backend->refcache);
return error;
}

Expand Down
33 changes: 33 additions & 0 deletions tests/refs/iterator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,36 @@ void test_refs_iterator__foreach_name_can_cancel(void)
-333);
cl_assert_equal_i(0, cancel_after);
}

void test_refs_iterator__concurrent_delete(void)
{
git_reference_iterator *iter;
size_t full_count = 0, concurrent_count = 0;
const char *name;
int error;

git_repository_free(repo);
repo = cl_git_sandbox_init("testrepo");

cl_git_pass(git_reference_iterator_new(&iter, repo));
while ((error = git_reference_next_name(&name, iter)) == 0) {
full_count++;
}

git_reference_iterator_free(iter);
cl_assert_equal_i(GIT_ITEROVER, error);

cl_git_pass(git_reference_iterator_new(&iter, repo));
while ((error = git_reference_next_name(&name, iter)) == 0) {
cl_git_pass(git_reference_remove(repo, name));
concurrent_count++;
}

git_reference_iterator_free(iter);
cl_assert_equal_i(GIT_ITEROVER, error);

cl_assert_equal_i(full_count, concurrent_count);

cl_git_sandbox_cleanup();
repo = NULL;
}