Add proper threading support to libgit2

We now depend on libpthread on all Unix platforms (should be installed
by default) and use a simple wrapper for Windows threads under Win32.

Signed-off-by: Vicent Marti <tanoku@gmail.com>

1 files changed, 20 insertions, 101 deletions

diff --git a/src/thread-utils.h b/src/thread-utils.h
index 0029e4bc1..e8372e731 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -1,108 +1,27 @@
 #ifndef INCLUDE_thread_utils_h__
 #define INCLUDE_thread_utils_h__
 
-#if defined(GIT_HAS_PTHREAD)
-	typedef pthread_t git_thread;
-#	define git_thread_create(thread, attr, start_routine, arg) pthread_create(thread, attr, start_routine, arg)
-#	define git_thread_kill(thread) pthread_cancel(thread)
-#	define git_thread_exit(status)	pthread_exit(status)
-#	define git_thread_join(id, status) pthread_join(id, status)
 
-	/* Pthreads Mutex */
-	typedef pthread_mutex_t git_lck;
-#	define GITLCK_INIT      PTHREAD_MUTEX_INITIALIZER
-#	define gitlck_init(a)   pthread_mutex_init(a, NULL)
-#	define gitlck_lock(a)   pthread_mutex_lock(a)
-#	define gitlck_unlock(a) pthread_mutex_unlock(a)
-#	define gitlck_free(a)   pthread_mutex_destroy(a)
-
-	/* Pthreads condition vars */
-	typedef pthread_cond_t git_cnd;
-#	define GITCND_INIT			PTHREAD_COND_INITIALIZER
-#	define gitcnd_init(c, a)	pthread_cond_init(c, a)
-#	define gitcnd_free(c)		pthread_cond_destroy(c)
-#	define gitcnd_wait(c, l)	pthread_cond_wait(c, l)
-#	define gitcnd_signal(c)		pthread_cond_signal(c)
-#	define gitcnd_broadcast(c)	pthread_cond_broadcast(c)
-
-#	if defined(GIT_HAS_ASM_ATOMIC)
-#		include <asm/atomic.h>
-		typedef atomic_t git_refcnt;
-#		define gitrc_init(a, v) atomic_set(a, v)
-#		define gitrc_inc(a)		atomic_inc_return(a)
-#		define gitrc_dec(a)		atomic_dec_and_test(a)
-#		define gitrc_free(a)	(void)0
-#	elif defined(GIT_WIN32)
-		typedef long git_refcnt;
-#		define gitrc_init(a, v)	(*a = v)
-#		define gitrc_inc(a)		(InterlockedIncrement(a))
-#		define gitrc_dec(a)		(!InterlockedDecrement(a))
-#		define gitrc_free(a)	(void)0
-#	else
-		typedef struct { git_lck lock; int counter; } git_refcnt;
-
-		/** Initialize to 0.  No memory barrier is issued. */
-		GIT_INLINE(void) gitrc_init(git_refcnt *p, int value)
-		{
-			gitlck_init(&p->lock);
-			p->counter = value;
-		}
-
-		/**
-		 * Increment.
-		 *
-		 * Atomically increments @p by 1.  A memory barrier is also
-		 * issued before and after the operation.
-		 *
-		 * @param p pointer of type git_refcnt
-		 */
-		GIT_INLINE(void) gitrc_inc(git_refcnt *p)
-		{
-			gitlck_lock(&p->lock);
-			p->counter++;
-			gitlck_unlock(&p->lock);
-		}
-
-		/**
-		 * Decrement and test.
-		 *
-		 * Atomically decrements @p by 1 and returns true if the
-		 * result is 0, or false for all other cases.  A memory
-		 * barrier is also issued before and after the operation.
-		 *
-		 * @param p pointer of type git_refcnt
-		 */
-		GIT_INLINE(int) gitrc_dec(git_refcnt *p)
-		{
-			int c;
-			gitlck_lock(&p->lock);
-			c = --p->counter;
-			gitlck_unlock(&p->lock);
-			return !c;
-		}
-
-		/** Free any resources associated with the counter. */
-#		define gitrc_free(p) gitlck_free(&(p)->lock)
-#	endif
-
-#elif defined(GIT_THREADS)
-#	error GIT_THREADS but no git_lck implementation
-
-#else
-	/* no threads support */
-	typedef struct { int dummy; } git_lck;
-#	define GIT_MUTEX_INIT   {}
-#	define gitlck_init(a)   (void)0
-#	define gitlck_lock(a)   (void)0
-#	define gitlck_unlock(a) (void)0
-#	define gitlck_free(a)   (void)0
-
-	typedef struct { int counter; } git_refcnt;
-#	define gitrc_init(a,v) ((a)->counter = v)
-#	define gitrc_inc(a)    ((a)->counter++)
-#	define gitrc_dec(a)    (--(a)->counter == 0)
-#	define gitrc_free(a)   (void)0
-#endif
+#define git_thread pthread_t
+#define git_thread_create(thread, attr, start_routine, arg) pthread_create(thread, attr, start_routine, arg)
+#define git_thread_kill(thread) pthread_cancel(thread)
+#define git_thread_exit(status)	pthread_exit(status)
+#define git_thread_join(id, status) pthread_join(id, status)
+
+/* Pthreads Mutex */
+#define git_mutex pthread_mutex_t
+#define git_mutex_init(a)   pthread_mutex_init(a, NULL)
+#define git_mutex_lock(a)   pthread_mutex_lock(a)
+#define git_mutex_unlock(a) pthread_mutex_unlock(a)
+#define git_mutex_free(a)   pthread_mutex_destroy(a)
+
+/* Pthreads condition vars */
+#define git_cond pthread_cond_t
+#define git_cond_init(c, a)	pthread_cond_init(c, a)
+#define git_cond_free(c)		pthread_cond_destroy(c)
+#define git_cond_wait(c, l)	pthread_cond_wait(c, l)
+#define git_cond_signal(c)		pthread_cond_signal(c)
+#define git_cond_broadcast(c)	pthread_cond_broadcast(c)
 
 extern int git_online_cpus(void);