X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=thread_sdl.c;h=8e0f49b79177c7d036115f2015f9f20e1b5b47c8;hb=e9206d59c8cde436ea29daa46a587db08f73a111;hp=3ce56c89f77e369049178099b741e5af9371e3e0;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb;p=xonotic%2Fdarkplaces.git

diff --git a/thread_sdl.c b/thread_sdl.c
index 3ce56c89..8e0f49b7 100644
--- a/thread_sdl.c
+++ b/thread_sdl.c
@@ -28,7 +28,7 @@ void *_Thread_CreateMutex(const char *filename, int fileline)
 {
 	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;
 }
@@ -36,7 +36,7 @@ void *_Thread_CreateMutex(const char *filename, int fileline)
 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);
 }
@@ -44,7 +44,7 @@ void _Thread_DestroyMutex(void *mutex, const char *filename, int fileline)
 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);
 }
@@ -52,7 +52,7 @@ int _Thread_LockMutex(void *mutex, const char *filename, int fileline)
 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);
 }
@@ -61,7 +61,7 @@ void *_Thread_CreateCond(const char *filename, int fileline)
 {
 	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;
 }
@@ -69,7 +69,7 @@ void *_Thread_CreateCond(const char *filename, int fileline)
 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);
 }
@@ -77,7 +77,7 @@ void _Thread_DestroyCond(void *cond, const char *filename, int fileline)
 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);
 }
@@ -85,7 +85,7 @@ int _Thread_CondSignal(void *cond, const char *filename, int fileline)
 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);
 }
@@ -93,7 +93,7 @@ int _Thread_CondBroadcast(void *cond, const char *filename, int fileline)
 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);
 }
@@ -102,7 +102,7 @@ void *_Thread_CreateThread(int (*fn)(void *), void *data, const char *filename,
 {
 	void *thread = (void *)SDL_CreateThread(fn, filename, data);
 #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;
 }
@@ -111,7 +111,7 @@ int _Thread_WaitThread(void *thread, int retval, const char *filename, int filel
 {
 	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;
@@ -130,7 +130,7 @@ void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileli
 {
 	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;
@@ -143,7 +143,7 @@ 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);
+	Sys_Printf("%p barrier destroy %s:%i\n", b, filename, fileline);
 #endif
 	Thread_DestroyMutex(b->mutex);
 	Thread_DestroyCond(b->cond);
@@ -153,7 +153,7 @@ 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);
+	Sys_Printf("%p barrier wait %s:%i\n", b, filename, fileline);
 #endif
 	Thread_LockMutex(b->mutex);
 	b->called++;
@@ -171,7 +171,7 @@ void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
 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);
+	Sys_Printf("%p atomic get at %s:%i\n", a, filename, fileline);
 #endif
 	return SDL_AtomicGet((SDL_atomic_t *)a);
 }
@@ -179,7 +179,7 @@ int _Thread_AtomicGet(Thread_Atomic *a, const char *filename, int fileline)
 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);
+	Sys_Printf("%p atomic set %v at %s:%i\n", a, v, filename, fileline);
 #endif
 	return SDL_AtomicSet((SDL_atomic_t *)a, v);
 }
@@ -187,7 +187,7 @@ int _Thread_AtomicSet(Thread_Atomic *a, int v, const char *filename, int filelin
 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);
+	Sys_Printf("%p atomic add %v at %s:%i\n", a, v, filename, fileline);
 #endif
 	return SDL_AtomicAdd((SDL_atomic_t *)a, v);
 }
@@ -195,7 +195,7 @@ int _Thread_AtomicAdd(Thread_Atomic *a, int v, const char *filename, int filelin
 void _Thread_AtomicIncRef(Thread_Atomic *a, const char *filename, int fileline)
 {
 #ifdef THREADDEBUG
-	Sys_PrintfToTerminal("%p atomic incref %s:%i\n", a, filename, fileline);
+	Sys_Printf("%p atomic incref %s:%i\n", a, filename, fileline);
 #endif
 	SDL_AtomicIncRef((SDL_atomic_t *)a);
 }
@@ -203,7 +203,7 @@ void _Thread_AtomicIncRef(Thread_Atomic *a, const char *filename, int fileline)
 qbool _Thread_AtomicDecRef(Thread_Atomic *a, const char *filename, int fileline)
 {
 #ifdef THREADDEBUG
-	Sys_PrintfToTerminal("%p atomic decref %s:%i\n", a, filename, fileline);
+	Sys_Printf("%p atomic decref %s:%i\n", a, filename, fileline);
 #endif
 	return SDL_AtomicDecRef((SDL_atomic_t *)a) != SDL_FALSE;
 }
@@ -211,7 +211,7 @@ qbool _Thread_AtomicDecRef(Thread_Atomic *a, const char *filename, int fileline)
 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);
+	Sys_Printf("%p atomic try lock %s:%i\n", lock, filename, fileline);
 #endif
 	return SDL_AtomicTryLock(lock) != SDL_FALSE;
 }
@@ -219,7 +219,7 @@ qbool _Thread_AtomicTryLock(Thread_SpinLock *lock, const char *filename, int fil
 void _Thread_AtomicLock(Thread_SpinLock *lock, const char *filename, int fileline)
 {
 #ifdef THREADDEBUG
-	Sys_PrintfToTerminal("%p atomic lock %s:%i\n", lock, filename, fileline);
+	Sys_Printf("%p atomic lock %s:%i\n", lock, filename, fileline);
 #endif
 	SDL_AtomicLock(lock);
 }
@@ -227,7 +227,7 @@ void _Thread_AtomicLock(Thread_SpinLock *lock, const char *filename, int filelin
 void _Thread_AtomicUnlock(Thread_SpinLock *lock, const char *filename, int fileline)
 {
 #ifdef THREADDEBUG
-	Sys_PrintfToTerminal("%p atomic unlock %s:%i\n", lock, filename, fileline);
+	Sys_Printf("%p atomic unlock %s:%i\n", lock, filename, fileline);
 #endif
 	SDL_AtomicUnlock(lock);
 }