Fix warnings when compiling without threads
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
diff --git a/src/sortedcache.c b/src/sortedcache.c
index 2efa3c4..d7e74d3 100644
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -176,6 +176,8 @@ bool git_sortedcache_out_of_date(git_sortedcache *sc)
/* lock sortedcache while making modifications */
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) {
giterr_set(GITERR_OS, "Unable to acquire mutex lock");
return -1;
diff --git a/tests-clar/threads/refdb.c b/tests-clar/threads/refdb.c
index 11e90a4..ffe4375 100644
--- a/tests-clar/threads/refdb.c
+++ b/tests-clar/threads/refdb.c
@@ -23,9 +23,7 @@ static void *iterate_refs(void *arg)
{
git_reference_iterator *i;
git_reference *ref;
- int count = 0, *id = arg;
-
- usleep(THREADS - *id);
+ int count = 0;
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) {
id[t] = t;
+#ifdef GIT_THREADS
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) {
cl_git_pass(git_thread_join(th[t], NULL));
}
+#endif
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);
if (!git_reference_lookup(&ref, g_repo, name)) {
- fprintf(stderr, "deleting %s\n", name);
cl_git_pass(git_reference_delete(ref));
git_reference_delete(ref);
}
@@ -180,9 +184,15 @@ void test_threads_refdb__edit_while_iterate(void)
}
id[t] = t;
+#ifdef GIT_THREADS
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) {
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) {
cl_git_pass(git_thread_join(th[t], NULL));
}
+#endif
}