X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=thread_pthread.c;h=2f8273ab41315f578c998a0344705ff8bbf864c8;hp=9340403ebb91cbc39a992401004a9de8bb1e7fe6;hb=4048c5cdec22f262fb5925aea3eb0d6941c4d0c5;hpb=1e28e9178acc4f23e8750c827360517b31e62c71

diff --git a/thread_pthread.c b/thread_pthread.c
index 9340403e..2f8273ab 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -16,7 +16,7 @@ void Thread_Shutdown(void)
 {
 }
 
-qboolean Thread_HasThreads(void)
+qbool Thread_HasThreads(void)
 {
 	return true;
 }
@@ -31,8 +31,10 @@ void *_Thread_CreateMutex(const char *filename, int fileline)
 	Sys_PrintfToTerminal("%p mutex create %s:%i\n" , mutexp, filename, fileline);
 #endif
 #ifdef THREADRECURSIVE
+	pthread_mutexattr_init(&attr);
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 	pthread_mutex_init(mutexp, &attr);
+	pthread_mutexattr_destroy(&attr);
 #else
 	pthread_mutex_init(mutexp, NULL);
 #endif
@@ -142,4 +144,83 @@ int _Thread_WaitThread(void *thread, int retval, const char *filename, int filel
 	return (int) (intptr_t) status;
 }
 
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
+void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
+{
+	pthread_barrier_t *b = (pthread_barrier_t *) Z_Malloc(sizeof(pthread_barrier_t));
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier create(%d) %s:%i\n", b, count, filename, fileline);
+#endif
+	pthread_barrier_init(b, NULL, count);
+	return (void *) b;
+}
+
+void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
+{
+	pthread_barrier_t *b = (pthread_barrier_t *) barrier;
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier destroy %s:%i\n", b, filename, fileline);
+#endif
+	pthread_barrier_destroy(b);
+}
+
+void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
+{
+	pthread_barrier_t *b = (pthread_barrier_t *) barrier;
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier wait %s:%i\n", b, filename, fileline);
+#endif
+	pthread_barrier_wait(b);
+}
+#else
+// standard barrier implementation using conds and mutexes
+// see: http://www.howforge.com/implementing-barrier-in-pthreads
+typedef struct {
+	unsigned int needed;
+	unsigned int called;
+	void *mutex;
+	void *cond;
+} barrier_t;
+
+void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
+{
+	volatile barrier_t *b = (volatile barrier_t *) Z_Malloc(sizeof(barrier_t));
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier create(%d) %s:%i\n", b, count, filename, fileline);
+#endif
+	b->needed = count;
+	b->called = 0;
+	b->mutex = Thread_CreateMutex();
+	b->cond = Thread_CreateCond();
+	return (void *) b;
+}
 
+void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
+{
+	volatile barrier_t *b = (volatile barrier_t *) barrier;
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier destroy %s:%i\n", b, filename, fileline);
+#endif
+	Thread_DestroyMutex(b->mutex);
+	Thread_DestroyCond(b->cond);
+}
+
+void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
+{
+	volatile barrier_t *b = (volatile barrier_t *) barrier;
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p barrier wait %s:%i\n", b, filename, fileline);
+#endif
+	Thread_LockMutex(b->mutex);
+	b->called++;
+	if (b->called == b->needed) {
+		b->called = 0;
+		Thread_CondBroadcast(b->cond);
+	} else {
+		do {
+			Thread_CondWait(b->cond, b->mutex);
+		} while(b->called);
+	}
+	Thread_UnlockMutex(b->mutex);
+}
+#endif