aboutsummaryrefslogtreecommitdiff
path: root/thread-utils.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-18 18:23:52 +0900
committerJunio C Hamano <gitster@pobox.com>2018-11-18 18:23:52 +0900
commit26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff (patch)
treeb2e5a385fe3e1825f11fa23de5c09cebe91c70a1 /thread-utils.c
parent62ca33e02a4ea93dd59538ac986a082430253b27 (diff)
parent2179045fd02acca83127f8d15ccd0eeb70b17400 (diff)
downloadgit-26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff.tar.xz
Merge branch 'nd/pthreads'
The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS". * nd/pthreads: Clean up pthread_create() error handling read-cache.c: initialize copy_len to shut up gcc 8 read-cache.c: reduce branching based on HAVE_THREADS read-cache.c: remove #ifdef NO_PTHREADS pack-objects: remove #ifdef NO_PTHREADS preload-index.c: remove #ifdef NO_PTHREADS grep: clean up num_threads handling grep: remove #ifdef NO_PTHREADS attr.c: remove #ifdef NO_PTHREADS name-hash.c: remove #ifdef NO_PTHREADS index-pack: remove #ifdef NO_PTHREADS send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c run-command.h: include thread-utils.h instead of pthread.h thread-utils: macros to unconditionally compile pthreads API
Diffstat (limited to 'thread-utils.c')
-rw-r--r--thread-utils.c48
1 files changed, 48 insertions, 0 deletions
diff --git a/thread-utils.c b/thread-utils.c
index a2135e0743..5329845691 100644
--- a/thread-utils.c
+++ b/thread-utils.c
@@ -20,6 +20,9 @@
int online_cpus(void)
{
+#ifdef NO_PTHREADS
+ return 1;
+#else
#ifdef _SC_NPROCESSORS_ONLN
long ncpus;
#endif
@@ -59,10 +62,12 @@ int online_cpus(void)
#endif
return 1;
+#endif
}
int init_recursive_mutex(pthread_mutex_t *m)
{
+#ifndef NO_PTHREADS
pthread_mutexattr_t a;
int ret;
@@ -74,4 +79,47 @@ int init_recursive_mutex(pthread_mutex_t *m)
pthread_mutexattr_destroy(&a);
}
return ret;
+#else
+ return 0;
+#endif
+}
+
+#ifdef NO_PTHREADS
+int dummy_pthread_create(pthread_t *pthread, const void *attr,
+ void *(*fn)(void *), void *data)
+{
+ /*
+ * Do nothing.
+ *
+ * The main purpose of this function is to break compiler's
+ * flow analysis and avoid -Wunused-variable false warnings.
+ */
+ return ENOSYS;
+}
+
+int dummy_pthread_init(void *data)
+{
+ /*
+ * Do nothing.
+ *
+ * The main purpose of this function is to break compiler's
+ * flow analysis or it may realize that functions like
+ * pthread_mutex_init() is no-op, which means the (static)
+ * variable is not used/initialized at all and trigger
+ * -Wunused-variable
+ */
+ return ENOSYS;
}
+
+int dummy_pthread_join(pthread_t pthread, void **retval)
+{
+ /*
+ * Do nothing.
+ *
+ * The main purpose of this function is to break compiler's
+ * flow analysis and avoid -Wunused-variable false warnings.
+ */
+ return ENOSYS;
+}
+
+#endif