X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=thread_win.c;h=ff1be87e8370b1c49501fc8e3c0e236aa468e22c;hb=220bfb551bac9181cd121366a3c858ef1499fcdf;hp=893e8306048ede60d060f24efbe3e5c9b8669a23;hpb=1e28e9178acc4f23e8750c827360517b31e62c71;p=xonotic%2Fdarkplaces.git

diff --git a/thread_win.c b/thread_win.c
index 893e8306..ff1be87e 100644
--- a/thread_win.c
+++ b/thread_win.c
@@ -4,6 +4,9 @@
 
 int Thread_Init(void)
 {
+#ifdef THREADDISABLE
+	Con_Printf("Threading disabled in this build\n");
+#endif
 	return 0;
 }
 
@@ -13,7 +16,11 @@ void Thread_Shutdown(void)
 
 qboolean Thread_HasThreads(void)
 {
+#ifdef THREADDISABLE
+	return false;
+#else
 	return true;
+#endif
 }
 
 void *_Thread_CreateMutex(const char *filename, int fileline)
@@ -46,7 +53,7 @@ int _Thread_UnlockMutex(void *mutex, const char *filename, int fileline)
 #ifdef THREADDEBUG
 	Sys_PrintfToTerminal("%p mutex unlock %s:%i\n" , mutex, filename, fileline);
 #endif
-	return (ReleaseMutex(mutex) == FALSE) ? -1 : 0;
+	return (ReleaseMutex(mutex) == false) ? -1 : 0;
 }
 
 typedef struct thread_semaphore_s
@@ -243,3 +250,54 @@ int _Thread_WaitThread(void *d, int retval, const char *filename, int fileline)
 	free(w);
 	return retval;
 }
+
+// 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);
+}