proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-12 16:01:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings when compiling without threads

Browse Source
This commit is contained in:
Russell Belfer 2013-08-21 16:50:03 -07:00
parent fe37274080
commit b37359aac5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sortedcache.c
View File

@ -176,6 +176,8 @@ bool git_sortedcache_out_of_date(git_sortedcache *sc)
/* lock sortedcache while making modifications */ /* lock sortedcache while making modifications */
int git_sortedcache_lock(git_sortedcache *sc) int git_sortedcache_lock(git_sortedcache *sc)
{ {
GIT_UNUSED(sc); /* to prevent warning when compiled w/o threads */
if (git_mutex_lock(&sc->lock) < 0) { if (git_mutex_lock(&sc->lock) < 0) {
giterr_set(GITERR_OS, "Unable to acquire mutex lock"); giterr_set(GITERR_OS, "Unable to acquire mutex lock");
return -1; return -1;

19
tests-clar/threads/refdb.c
View File

@ -23,9 +23,7 @@ static void *iterate_refs(void *arg)
{ {
git_reference_iterator *i; git_reference_iterator *i;
git_reference *ref; git_reference *ref;
int count = 0, *id = arg; int count = 0;
usleep(THREADS - *id);
cl_git_pass(git_reference_iterator_new(&i, g_repo)); cl_git_pass(git_reference_iterator_new(&i, g_repo));
@ -75,12 +73,19 @@ void test_threads_refdb__iterator(void)
for (t = 0; t < THREADS; ++t) { for (t = 0; t < THREADS; ++t) {
id[t] = t; id[t] = t;
#ifdef GIT_THREADS
cl_git_pass(git_thread_create(&th[t], NULL, iterate_refs, &id[t])); cl_git_pass(git_thread_create(&th[t], NULL, iterate_refs, &id[t]));
#else
th[t] = t;
iterate_refs(&id[t]);
#endif
} }
#ifdef GIT_THREADS
for (t = 0; t < THREADS; ++t) { for (t = 0; t < THREADS; ++t) {
cl_git_pass(git_thread_join(th[t], NULL)); cl_git_pass(git_thread_join(th[t], NULL));
} }
#endif
memset(th, 0, sizeof(th)); memset(th, 0, sizeof(th));
} }
@ -124,7 +129,6 @@ static void *delete_refs(void *arg)
name, sizeof(name), "refs/heads/thread-%03d-%02d", (*id) & ~0x3, i); name, sizeof(name), "refs/heads/thread-%03d-%02d", (*id) & ~0x3, i);
if (!git_reference_lookup(&ref, g_repo, name)) { if (!git_reference_lookup(&ref, g_repo, name)) {
fprintf(stderr, "deleting %s\n", name);
cl_git_pass(git_reference_delete(ref)); cl_git_pass(git_reference_delete(ref));
git_reference_delete(ref); git_reference_delete(ref);
} }
@ -180,9 +184,15 @@ void test_threads_refdb__edit_while_iterate(void)
} }
id[t] = t; id[t] = t;
#ifdef GIT_THREADS
cl_git_pass(git_thread_create(&th[t], NULL, fn, &id[t])); cl_git_pass(git_thread_create(&th[t], NULL, fn, &id[t]));
#else
th[t] = t;
fn(&id[t]);
#endif
} }
#ifdef GIT_THREADS
for (t = 0; t < THREADS; ++t) { for (t = 0; t < THREADS; ++t) {
cl_git_pass(git_thread_join(th[t], NULL)); cl_git_pass(git_thread_join(th[t], NULL));
} }
@ -197,4 +207,5 @@ void test_threads_refdb__edit_while_iterate(void)
for (t = 0; t < THREADS; ++t) { for (t = 0; t < THREADS; ++t) {
cl_git_pass(git_thread_join(th[t], NULL)); cl_git_pass(git_thread_join(th[t], NULL));
} }
#endif
} }