adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDL2 thread IDs can be 64-bit

Browse Source
This commit is contained in:
Michael Martin
2019-08-25 16:45:49 -07:00
parent 8fb39785b2
commit 761843cc72
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/threads/sdl/sdlthreads.c
+10 -6
View File
@@ -29,6 +29,10 @@
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#if SDL_MAJOR_VERSION == 1
typedef Uint32 SDL_threadID;
#endif
typedef struct _thread { typedef struct _thread {
void *native; void *native;
#ifdef NAMED_SYNCHRO #ifdef NAMED_SYNCHRO
@@ -70,7 +74,7 @@ SigUSR1Handler (int signr) {
static void static void
LocalStats (SDL_Thread *thread) { LocalStats (SDL_Thread *thread) {
#if defined (WIN32) || !defined(SDL_PTHREADS) #if defined (WIN32) || !defined(SDL_PTHREADS)
fprintf (stderr, "Thread ID %u\n", SDL_GetThreadID (thread)); fprintf (stderr, "Thread ID %08lx\n", (Uint64)SDL_GetThreadID (thread));
#else /* !defined (WIN32) && defined(SDL_PTHREADS) */ #else /* !defined (WIN32) && defined(SDL_PTHREADS) */
// This only works if SDL implements threads as processes // This only works if SDL implements threads as processes
pid_t pid; pid_t pid;
@@ -163,7 +167,7 @@ UnQueueThread (TrueThread thread)
} }
static TrueThread static TrueThread
FindThreadInfo (Uint32 threadID) FindThreadInfo (SDL_threadID threadID)
{ {
TrueThread ptr; TrueThread ptr;
@@ -336,7 +340,7 @@ GetMyThreadLocal_SDL (void)
typedef struct _mutex { typedef struct _mutex {
SDL_mutex *mutex; SDL_mutex *mutex;
#ifdef TRACK_CONTENTION #ifdef TRACK_CONTENTION
Uint32 owner; SDL_threadID owner;
#endif #endif
#ifdef NAMED_SYNCHRO #ifdef NAMED_SYNCHRO
const char *name; const char *name;
@@ -518,7 +522,7 @@ ClearSemaphore_SDL (Semaphore s)
typedef struct _recm { typedef struct _recm {
SDL_mutex *mutex; SDL_mutex *mutex;
Uint32 thread_id; SDL_threadID thread_id;
Uint32 locks; Uint32 locks;
#ifdef NAMED_SYNCHRO #ifdef NAMED_SYNCHRO
const char *name; const char *name;
@@ -568,7 +572,7 @@ void
LockRecursiveMutex_SDL (RecursiveMutex val) LockRecursiveMutex_SDL (RecursiveMutex val)
{ {
RecM *mtx = (RecM *)val; RecM *mtx = (RecM *)val;
Uint32 thread_id = SDL_ThreadID(); SDL_threadID thread_id = SDL_ThreadID();
if (!mtx->locks || mtx->thread_id != thread_id) if (!mtx->locks || mtx->thread_id != thread_id)
{ {
#ifdef TRACK_CONTENTION #ifdef TRACK_CONTENTION
@@ -589,7 +593,7 @@ void
UnlockRecursiveMutex_SDL (RecursiveMutex val) UnlockRecursiveMutex_SDL (RecursiveMutex val)
{ {
RecM *mtx = (RecM *)val; RecM *mtx = (RecM *)val;
Uint32 thread_id = SDL_ThreadID(); SDL_threadID thread_id = SDL_ThreadID();
if (!mtx->locks || mtx->thread_id != thread_id) if (!mtx->locks || mtx->thread_id != thread_id)
{ {
#ifdef NAMED_SYNCHRO #ifdef NAMED_SYNCHRO