X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=thread_sdl.c;h=4f58f71d386f95863d6a6752cee0ea133f91776d;hp=5272221e946206fe6955725a2a447dae51d9f274;hb=fcca38006977b1073fa82907dd5db8fea339c5f4;hpb=9cffca779de91e174191e4a853211892e44b605e

diff --git a/thread_sdl.c b/thread_sdl.c
index 5272221e..4f58f71d 100644
--- a/thread_sdl.c
+++ b/thread_sdl.c
@@ -1,10 +1,13 @@
-#include "quakedef.h"
-#include "thread.h"
 #include <SDL.h>
 #include <SDL_thread.h>
+#include "quakedef.h"
+#include "thread.h"
 
 int Thread_Init(void)
 {
+#ifdef THREADDISABLE
+	Con_Printf("Threading disabled in this build\n");
+#endif
 	return 0;
 }
 
@@ -14,64 +17,157 @@ void Thread_Shutdown(void)
 
 qboolean Thread_HasThreads(void)
 {
+#ifdef THREADDISABLE
+	return false;
+#else
 	return true;
+#endif
 }
 
-void *Thread_CreateMutex(void)
+void *_Thread_CreateMutex(const char *filename, int fileline)
 {
-	return SDL_CreateMutex();
+	void *mutex = SDL_CreateMutex();
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p mutex create %s:%i\n" , mutex, filename, fileline);
+#endif
+	return mutex;
 }
 
-void Thread_DestroyMutex(void *mutex)
+void _Thread_DestroyMutex(void *mutex, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p mutex destroy %s:%i\n", mutex, filename, fileline);
+#endif
 	SDL_DestroyMutex((SDL_mutex *)mutex);
 }
 
-int Thread_LockMutex(void *mutex)
+int _Thread_LockMutex(void *mutex, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p mutex lock %s:%i\n"   , mutex, filename, fileline);
+#endif
 	return SDL_LockMutex((SDL_mutex *)mutex);
 }
 
-int Thread_UnlockMutex(void *mutex)
+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 SDL_UnlockMutex((SDL_mutex *)mutex);
 }
 
-void *Thread_CreateCond(void)
+void *_Thread_CreateCond(const char *filename, int fileline)
 {
-	return SDL_CreateCond();
+	void *cond = (void *)SDL_CreateCond();
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p cond create %s:%i\n"   , cond, filename, fileline);
+#endif
+	return cond;
 }
 
-void Thread_DestroyCond(void *cond)
+void _Thread_DestroyCond(void *cond, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p cond destroy %s:%i\n"   , cond, filename, fileline);
+#endif
 	SDL_DestroyCond((SDL_cond *)cond);
 }
 
-int Thread_CondSignal(void *cond)
+int _Thread_CondSignal(void *cond, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p cond signal %s:%i\n"   , cond, filename, fileline);
+#endif
 	return SDL_CondSignal((SDL_cond *)cond);
 }
 
-int Thread_CondBroadcast(void *cond)
+int _Thread_CondBroadcast(void *cond, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p cond broadcast %s:%i\n"   , cond, filename, fileline);
+#endif
 	return SDL_CondBroadcast((SDL_cond *)cond);
 }
 
-int Thread_CondWait(void *cond, void *mutex)
+int _Thread_CondWait(void *cond, void *mutex, const char *filename, int fileline)
 {
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p cond wait %s:%i\n"   , cond, filename, fileline);
+#endif
 	return SDL_CondWait((SDL_cond *)cond, (SDL_mutex *)mutex);
 }
 
-void *Thread_CreateThread(int (*fn)(void *), void *data)
+void *_Thread_CreateThread(int (*fn)(void *), void *data, const char *filename, int fileline)
 {
-	return SDL_CreateThread(fn, data);
+#if SDL_MAJOR_VERSION == 1
+	void *thread = (void *)SDL_CreateThread(fn, data);
+#else
+	void *thread = (void *)SDL_CreateThread(fn, filename, data);
+#endif
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p thread create %s:%i\n"   , thread, filename, fileline);
+#endif
+	return thread;
 }
 
-int Thread_WaitThread(void *thread, int retval)
+int _Thread_WaitThread(void *thread, int retval, const char *filename, int fileline)
 {
 	int status = retval;
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p thread wait %s:%i\n"   , thread, filename, fileline);
+#endif
 	SDL_WaitThread((SDL_Thread *)thread, &status);
 	return status;
 }
 
-	
+// 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);
+}