X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=thread.h;h=05b0f8595cdbe43a6b705b8318e0162b8eddaf8c;hp=7f88d8b4324adf5fc722681b9de03412ecdb46f2;hb=58c33270c280aafe85a1eacb224efdd9138fdb19;hpb=b0cf9e63ac2bba7fd155b2bb53318fc85ef168d6

diff --git a/thread.h b/thread.h
index 7f88d8b4..05b0f859 100644
--- a/thread.h
+++ b/thread.h
@@ -1,4 +1,7 @@
 #ifndef THREAD_H
+#define THREAD_H
+
+#include "qtypes.h"
 
 // enable Sys_PrintfToTerminal calls on nearly every threading call
 //#define THREADDEBUG
@@ -6,6 +9,9 @@
 // use recursive mutex (non-posix) extensions in thread_pthread
 #define THREADRECURSIVE
 
+typedef int Thread_SpinLock;
+typedef struct {int value;} Thread_Atomic;
+
 #define Thread_CreateMutex()              (_Thread_CreateMutex(__FILE__, __LINE__))
 #define Thread_DestroyMutex(m)            (_Thread_DestroyMutex(m, __FILE__, __LINE__))
 #define Thread_LockMutex(m)               (_Thread_LockMutex(m, __FILE__, __LINE__))
@@ -17,10 +23,21 @@
 #define Thread_CondWait(cond, mutex)      (_Thread_CondWait(cond, mutex, __FILE__, __LINE__))
 #define Thread_CreateThread(fn, data)     (_Thread_CreateThread(fn, data, __FILE__, __LINE__))
 #define Thread_WaitThread(thread, retval) (_Thread_WaitThread(thread, retval, __FILE__, __LINE__))
+#define Thread_CreateBarrier(count)       (_Thread_CreateBarrier(count, __FILE__, __LINE__))
+#define Thread_DestroyBarrier(barrier)    (_Thread_DestroyBarrier(barrier, __FILE__, __LINE__))
+#define Thread_WaitBarrier(barrier)       (_Thread_WaitBarrier(barrier, __FILE__, __LINE__))
+#define Thread_AtomicGet(a)               (_Thread_AtomicGet(a, __FILE__, __LINE__))
+#define Thread_AtomicSet(a, v)            (_Thread_AtomicSet(a, v, __FILE__, __LINE__))
+#define Thread_AtomicAdd(a, v)            (_Thread_AtomicAdd(a, v, __FILE__, __LINE__))
+#define Thread_AtomicIncRef(a)            (_Thread_AtomicIncRef(a, __FILE__, __LINE__))
+#define Thread_AtomicDecRef(a)            (_Thread_AtomicDecRef(a, __FILE__, __LINE__))
+#define Thread_AtomicTryLock(lock)        (_Thread_AtomicTryLock(lock, __FILE__, __LINE__))
+#define Thread_AtomicLock(lock)           (_Thread_AtomicLock(lock, __FILE__, __LINE__))
+#define Thread_AtomicUnlock(lock)         (_Thread_AtomicUnlock(lock, __FILE__, __LINE__))
 
 int Thread_Init(void);
 void Thread_Shutdown(void);
-qboolean Thread_HasThreads(void);
+qbool Thread_HasThreads(void);
 void *_Thread_CreateMutex(const char *filename, int fileline);
 void _Thread_DestroyMutex(void *mutex, const char *filename, int fileline);
 int _Thread_LockMutex(void *mutex, const char *filename, int fileline);
@@ -32,6 +49,16 @@ int _Thread_CondBroadcast(void *cond, const char *filename, int fileline);
 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);
 int _Thread_WaitThread(void *thread, int retval, const char *filename, int fileline);
+void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline);
+void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline);
+void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline);
+int _Thread_AtomicGet(Thread_Atomic *ref, const char *filename, int fileline);
+int _Thread_AtomicSet(Thread_Atomic *ref, int v, const char *filename, int fileline);
+int _Thread_AtomicAdd(Thread_Atomic *ref, int v, const char *filename, int fileline);
+void _Thread_AtomicIncRef(Thread_Atomic *ref, const char *filename, int fileline);
+qbool _Thread_AtomicDecRef(Thread_Atomic *ref, const char *filename, int fileline);
+qbool _Thread_AtomicTryLock(Thread_SpinLock *lock, const char *filename, int fileline);
+void _Thread_AtomicLock(Thread_SpinLock *lock, const char *filename, int fileline);
+void _Thread_AtomicUnlock(Thread_SpinLock *lock, const char *filename, int fileline);
 
 #endif
-