X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=thread_sdl.c;h=3ce56c89f77e369049178099b741e5af9371e3e0;hb=6a64fd9be444415e5b311251a33ae418d92cd1e1;hp=9df9ffc9ebfeac7c37677bb70717c717f3e63be3;hpb=1f235f06de684fe5a3626b1dc51f638a1ff4cdb0;p=xonotic%2Fdarkplaces.git

diff --git a/thread_sdl.c b/thread_sdl.c
index 9df9ffc9..3ce56c89 100644
--- a/thread_sdl.c
+++ b/thread_sdl.c
@@ -1,7 +1,7 @@
-#include "quakedef.h"
-#include "thread.h"
 #include <SDL.h>
 #include <SDL_thread.h>
+#include "quakedef.h"
+#include "thread.h"
 
 int Thread_Init(void)
 {
@@ -15,7 +15,7 @@ void Thread_Shutdown(void)
 {
 }
 
-qboolean Thread_HasThreads(void)
+qbool Thread_HasThreads(void)
 {
 #ifdef THREADDISABLE
 	return false;
@@ -100,7 +100,7 @@ int _Thread_CondWait(void *cond, void *mutex, const char *filename, int fileline
 
 void *_Thread_CreateThread(int (*fn)(void *), void *data, const char *filename, int fileline)
 {
-	void *thread = (void *)SDL_CreateThread(fn, data);
+	void *thread = (void *)SDL_CreateThread(fn, filename, data);
 #ifdef THREADDEBUG
 	Sys_PrintfToTerminal("%p thread create %s:%i\n"   , thread, filename, fileline);
 #endif
@@ -128,7 +128,7 @@ typedef struct {
 
 void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
 {
-	barrier_t *b = Z_Malloc(sizeof(barrier_t));
+	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
@@ -141,7 +141,7 @@ void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileli
 
 void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
 {
-	barrier_t *b = (barrier_t *) barrier;
+	volatile barrier_t *b = (volatile barrier_t *) barrier;
 #ifdef THREADDEBUG
 	Sys_PrintfToTerminal("%p barrier destroy %s:%i\n", b, filename, fileline);
 #endif
@@ -151,7 +151,7 @@ void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
 
 void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
 {
-	barrier_t *b = (barrier_t *) barrier;
+	volatile barrier_t *b = (volatile barrier_t *) barrier;
 #ifdef THREADDEBUG
 	Sys_PrintfToTerminal("%p barrier wait %s:%i\n", b, filename, fileline);
 #endif
@@ -167,4 +167,67 @@ void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
 	}
 	Thread_UnlockMutex(b->mutex);
 }
-	
+
+int _Thread_AtomicGet(Thread_Atomic *a, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic get at %s:%i\n", a, filename, fileline);
+#endif
+	return SDL_AtomicGet((SDL_atomic_t *)a);
+}
+
+int _Thread_AtomicSet(Thread_Atomic *a, int v, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic set %v at %s:%i\n", a, v, filename, fileline);
+#endif
+	return SDL_AtomicSet((SDL_atomic_t *)a, v);
+}
+
+int _Thread_AtomicAdd(Thread_Atomic *a, int v, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic add %v at %s:%i\n", a, v, filename, fileline);
+#endif
+	return SDL_AtomicAdd((SDL_atomic_t *)a, v);
+}
+
+void _Thread_AtomicIncRef(Thread_Atomic *a, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic incref %s:%i\n", a, filename, fileline);
+#endif
+	SDL_AtomicIncRef((SDL_atomic_t *)a);
+}
+
+qbool _Thread_AtomicDecRef(Thread_Atomic *a, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic decref %s:%i\n", a, filename, fileline);
+#endif
+	return SDL_AtomicDecRef((SDL_atomic_t *)a) != SDL_FALSE;
+}
+
+qbool _Thread_AtomicTryLock(Thread_SpinLock *lock, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic try lock %s:%i\n", lock, filename, fileline);
+#endif
+	return SDL_AtomicTryLock(lock) != SDL_FALSE;
+}
+
+void _Thread_AtomicLock(Thread_SpinLock *lock, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic lock %s:%i\n", lock, filename, fileline);
+#endif
+	SDL_AtomicLock(lock);
+}
+
+void _Thread_AtomicUnlock(Thread_SpinLock *lock, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+	Sys_PrintfToTerminal("%p atomic unlock %s:%i\n", lock, filename, fileline);
+#endif
+	SDL_AtomicUnlock(lock);
+}