-#include "quakedef.h"
-#include "thread.h"
#include <SDL.h>
#include <SDL_thread.h>
+#include "quakedef.h"
+#include "thread.h"
int Thread_Init(void)
{
{
}
-qboolean Thread_HasThreads(void)
+qbool Thread_HasThreads(void)
{
#ifdef THREADDISABLE
return false;
{
void *mutex = SDL_CreateMutex();
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p mutex create %s:%i\n" , mutex, filename, fileline);
+ Sys_Printf("%p mutex create %s:%i\n" , mutex, filename, fileline);
#endif
return mutex;
}
void _Thread_DestroyMutex(void *mutex, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p mutex destroy %s:%i\n", mutex, filename, fileline);
+ Sys_Printf("%p mutex destroy %s:%i\n", mutex, filename, fileline);
#endif
SDL_DestroyMutex((SDL_mutex *)mutex);
}
int _Thread_LockMutex(void *mutex, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p mutex lock %s:%i\n" , mutex, filename, fileline);
+ Sys_Printf("%p mutex lock %s:%i\n" , mutex, filename, fileline);
#endif
return SDL_LockMutex((SDL_mutex *)mutex);
}
int _Thread_UnlockMutex(void *mutex, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p mutex unlock %s:%i\n" , mutex, filename, fileline);
+ Sys_Printf("%p mutex unlock %s:%i\n" , mutex, filename, fileline);
#endif
return SDL_UnlockMutex((SDL_mutex *)mutex);
}
{
void *cond = (void *)SDL_CreateCond();
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p cond create %s:%i\n" , cond, filename, fileline);
+ Sys_Printf("%p cond create %s:%i\n" , cond, filename, fileline);
#endif
return cond;
}
void _Thread_DestroyCond(void *cond, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p cond destroy %s:%i\n" , cond, filename, fileline);
+ Sys_Printf("%p cond destroy %s:%i\n" , cond, filename, fileline);
#endif
SDL_DestroyCond((SDL_cond *)cond);
}
int _Thread_CondSignal(void *cond, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p cond signal %s:%i\n" , cond, filename, fileline);
+ Sys_Printf("%p cond signal %s:%i\n" , cond, filename, fileline);
#endif
return SDL_CondSignal((SDL_cond *)cond);
}
int _Thread_CondBroadcast(void *cond, const char *filename, int fileline)
{
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p cond broadcast %s:%i\n" , cond, filename, fileline);
+ Sys_Printf("%p cond broadcast %s:%i\n" , cond, filename, fileline);
#endif
return SDL_CondBroadcast((SDL_cond *)cond);
}
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);
+ Sys_Printf("%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, const char *filename, int fileline)
{
-#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);
+ Sys_Printf("%p thread create %s:%i\n" , thread, filename, fileline);
#endif
return thread;
}
{
int status = retval;
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p thread wait %s:%i\n" , thread, filename, fileline);
+ Sys_Printf("%p thread wait %s:%i\n" , thread, filename, fileline);
#endif
SDL_WaitThread((SDL_Thread *)thread, &status);
return status;
{
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);
+ Sys_Printf("%p barrier create(%d) %s:%i\n", b, count, filename, fileline);
#endif
b->needed = count;
b->called = 0;
{
volatile barrier_t *b = (volatile barrier_t *) barrier;
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p barrier destroy %s:%i\n", b, filename, fileline);
+ Sys_Printf("%p barrier destroy %s:%i\n", b, filename, fileline);
#endif
Thread_DestroyMutex(b->mutex);
Thread_DestroyCond(b->cond);
{
volatile barrier_t *b = (volatile barrier_t *) barrier;
#ifdef THREADDEBUG
- Sys_PrintfToTerminal("%p barrier wait %s:%i\n", b, filename, fileline);
+ Sys_Printf("%p barrier wait %s:%i\n", b, filename, fileline);
#endif
Thread_LockMutex(b->mutex);
b->called++;
}
Thread_UnlockMutex(b->mutex);
}
+
+int _Thread_AtomicGet(Thread_Atomic *a, const char *filename, int fileline)
+{
+#ifdef THREADDEBUG
+ Sys_Printf("%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_Printf("%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_Printf("%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_Printf("%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_Printf("%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_Printf("%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_Printf("%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_Printf("%p atomic unlock %s:%i\n", lock, filename, fileline);
+#endif
+ SDL_AtomicUnlock(lock);
+}