mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-26 12:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove almost all instances of "volatile" keyword.

Browse Source 
As Tiffany pointed out in Bugzilla, volatile is not useful for thread safety:

https://software.intel.com/en-us/blogs/2007/11/30/volatile-almost-useless-for-multi-threaded-programming/

Some of these volatiles didn't need to be, some were otherwise protected by
spinlocks or mutexes, and some got moved over to SDL_atomic_t data, etc.

Fixes Bugzilla #3220.
This commit is contained in:
Ryan C. Gordon
2016-01-03 06:50:50 -05:00
parent 21f66ea295
commit fa8c83c1c1
11 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dynapi/SDL_dynapi.c
View File

@@ -293,7 +293,7 @@ SDL_InitDynamicAPI(void)
* SDL_CreateThread() would also call this function before building the * SDL_CreateThread() would also call this function before building the
* new thread). * new thread).
*/ */
static volatile SDL_bool already_initialized = SDL_FALSE; static SDL_bool already_initialized = SDL_FALSE;
/* SDL_AtomicLock calls SDL mutex functions to emulate if /* SDL_AtomicLock calls SDL mutex functions to emulate if
SDL_ATOMIC_DISABLED, which we can't do here, so in such a SDL_ATOMIC_DISABLED, which we can't do here, so in such a

38
src/events/SDL_events.c
View File

@@ -73,15 +73,15 @@ typedef struct _SDL_SysWMEntry
static struct static struct
{ {
SDL_mutex *lock; SDL_mutex *lock;
volatile SDL_bool active; SDL_atomic_t active;
volatile int count; SDL_atomic_t count;
volatile int max_events_seen; int max_events_seen;
SDL_EventEntry *head; SDL_EventEntry *head;
SDL_EventEntry *tail; SDL_EventEntry *tail;
SDL_EventEntry *free; SDL_EventEntry *free;
SDL_SysWMEntry *wmmsg_used; SDL_SysWMEntry *wmmsg_used;
SDL_SysWMEntry *wmmsg_free; SDL_SysWMEntry *wmmsg_free;
} SDL_EventQ = { NULL, SDL_TRUE, 0, 0, NULL, NULL, NULL, NULL, NULL }; } SDL_EventQ = { NULL, { 1 }, { 0 }, 0, NULL, NULL, NULL, NULL, NULL };
/* Public functions */ /* Public functions */
@@ -98,7 +98,7 @@ SDL_StopEventLoop(void)
SDL_LockMutex(SDL_EventQ.lock); SDL_LockMutex(SDL_EventQ.lock);
} }
SDL_EventQ.active = SDL_FALSE; SDL_AtomicSet(&SDL_EventQ.active, 0);
if (report && SDL_atoi(report)) { if (report && SDL_atoi(report)) {
SDL_Log("SDL EVENT QUEUE: Maximum events in-flight: %d\n", SDL_Log("SDL EVENT QUEUE: Maximum events in-flight: %d\n",
@@ -127,7 +127,7 @@ SDL_StopEventLoop(void)
wmmsg = next; wmmsg = next;
} }
SDL_EventQ.count = 0; SDL_AtomicSet(&SDL_EventQ.count, 0);
SDL_EventQ.max_events_seen = 0; SDL_EventQ.max_events_seen = 0;
SDL_EventQ.head = NULL; SDL_EventQ.head = NULL;
SDL_EventQ.tail = NULL; SDL_EventQ.tail = NULL;
@@ -171,7 +171,7 @@ SDL_StartEventLoop(void)
SDL_EventQ.lock = SDL_CreateMutex(); SDL_EventQ.lock = SDL_CreateMutex();
} }
if (SDL_EventQ.lock == NULL) { if (SDL_EventQ.lock == NULL) {
return (-1); return -1;
} }
#endif /* !SDL_THREADS_DISABLED */ #endif /* !SDL_THREADS_DISABLED */
@@ -180,9 +180,9 @@ SDL_StartEventLoop(void)
SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE); SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE); SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE);
SDL_EventQ.active = SDL_TRUE; SDL_AtomicSet(&SDL_EventQ.active, 1);
return (0); return 0;
} }
@@ -191,9 +191,11 @@ static int
SDL_AddEvent(SDL_Event * event) SDL_AddEvent(SDL_Event * event)
{ {
SDL_EventEntry *entry; SDL_EventEntry *entry;
const int initial_count = SDL_AtomicGet(&SDL_EventQ.count);
int final_count;
if (SDL_EventQ.count >= SDL_MAX_QUEUED_EVENTS) { if (initial_count >= SDL_MAX_QUEUED_EVENTS) {
SDL_SetError("Event queue is full (%d events)", SDL_EventQ.count); SDL_SetError("Event queue is full (%d events)", initial_count);
return 0; return 0;
} }
@@ -225,10 +227,10 @@ SDL_AddEvent(SDL_Event * event)
entry->prev = NULL; entry->prev = NULL;
entry->next = NULL; entry->next = NULL;
} }
++SDL_EventQ.count;
if (SDL_EventQ.count > SDL_EventQ.max_events_seen) { final_count = SDL_AtomicAdd(&SDL_EventQ.count, 1) + 1;
SDL_EventQ.max_events_seen = SDL_EventQ.count; if (final_count > SDL_EventQ.max_events_seen) {
SDL_EventQ.max_events_seen = final_count;
} }
return 1; return 1;
@@ -256,8 +258,8 @@ SDL_CutEvent(SDL_EventEntry *entry)
entry->next = SDL_EventQ.free; entry->next = SDL_EventQ.free;
SDL_EventQ.free = entry; SDL_EventQ.free = entry;
SDL_assert(SDL_EventQ.count > 0); SDL_assert(SDL_AtomicGet(&SDL_EventQ.count) > 0);
--SDL_EventQ.count; SDL_AtomicAdd(&SDL_EventQ.count, -1);
} }
/* Lock the event queue, take a peep at it, and unlock it */ /* Lock the event queue, take a peep at it, and unlock it */
@@ -268,7 +270,7 @@ SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action,
int i, used; int i, used;
/* Don't look after we've quit */ /* Don't look after we've quit */
if (!SDL_EventQ.active) { if (!SDL_AtomicGet(&SDL_EventQ.active)) {
/* We get a few spurious events at shutdown, so don't warn then */ /* We get a few spurious events at shutdown, so don't warn then */
if (action != SDL_ADDEVENT) { if (action != SDL_ADDEVENT) {
SDL_SetError("The event system has been shut down"); SDL_SetError("The event system has been shut down");
@@ -363,7 +365,7 @@ void
SDL_FlushEvents(Uint32 minType, Uint32 maxType) SDL_FlushEvents(Uint32 minType, Uint32 maxType)
{ {
/* Don't look after we've quit */ /* Don't look after we've quit */
if (!SDL_EventQ.active) { if (!SDL_AtomicGet(&SDL_EventQ.active)) {
return; return;
} }

2
src/haptic/windows/SDL_windowshaptic.c
View File

@@ -255,7 +255,7 @@ SDL_SYS_HapticQuit(void)
for (hapticitem = SDL_haptics; hapticitem; hapticitem = hapticitem->next) { for (hapticitem = SDL_haptics; hapticitem; hapticitem = hapticitem->next) {
if ((hapticitem->hwdata->bXInputHaptic) && (hapticitem->hwdata->thread)) { if ((hapticitem->hwdata->bXInputHaptic) && (hapticitem->hwdata->thread)) {
/* we _have_ to stop the thread before we free the XInput DLL! */ /* we _have_ to stop the thread before we free the XInput DLL! */
hapticitem->hwdata->stopThread = 1; SDL_AtomicSet(&hapticitem->hwdata->stopThread, 1);
SDL_WaitThread(hapticitem->hwdata->thread, NULL); SDL_WaitThread(hapticitem->hwdata->thread, NULL);
hapticitem->hwdata->thread = NULL; hapticitem->hwdata->thread = NULL;
} }

4
src/haptic/windows/SDL_windowshaptic_c.h
View File

@@ -42,8 +42,8 @@ struct haptic_hwdata
Uint8 userid; /* XInput userid index for this joystick */ Uint8 userid; /* XInput userid index for this joystick */
SDL_Thread *thread; SDL_Thread *thread;
SDL_mutex *mutex; SDL_mutex *mutex;
volatile Uint32 stopTicks; Uint32 stopTicks;
volatile int stopThread; SDL_atomic_t stopThread;
}; };

4
src/haptic/windows/SDL_xinputhaptic.c
View File

@@ -146,7 +146,7 @@ SDL_RunXInputHaptic(void *arg)
{ {
struct haptic_hwdata *hwdata = (struct haptic_hwdata *) arg; struct haptic_hwdata *hwdata = (struct haptic_hwdata *) arg;
while (!hwdata->stopThread) { while (!SDL_AtomicGet(&hwdata->stopThread)) {
SDL_Delay(50); SDL_Delay(50);
SDL_LockMutex(hwdata->mutex); SDL_LockMutex(hwdata->mutex);
/* If we're currently running and need to stop... */ /* If we're currently running and need to stop... */
@@ -261,7 +261,7 @@ SDL_XINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
void void
SDL_XINPUT_HapticClose(SDL_Haptic * haptic) SDL_XINPUT_HapticClose(SDL_Haptic * haptic)
{ {
haptic->hwdata->stopThread = 1; SDL_AtomicSet(&haptic->hwdata->stopThread, 1);
SDL_WaitThread(haptic->hwdata->thread, NULL); SDL_WaitThread(haptic->hwdata->thread, NULL);
SDL_DestroyMutex(haptic->hwdata->mutex); SDL_DestroyMutex(haptic->hwdata->mutex);
} }

43
src/timer/SDL_timer.c
View File

@@ -35,7 +35,7 @@ typedef struct _SDL_Timer
void *param; void *param;
Uint32 interval; Uint32 interval;
Uint32 scheduled; Uint32 scheduled;
volatile SDL_bool canceled; SDL_atomic_t canceled;
struct _SDL_Timer *next; struct _SDL_Timer *next;
} SDL_Timer; } SDL_Timer;
@@ -60,9 +60,9 @@ typedef struct {
/* Data used to communicate with the timer thread */ /* Data used to communicate with the timer thread */
SDL_SpinLock lock; SDL_SpinLock lock;
SDL_sem *sem; SDL_sem *sem;
SDL_Timer * volatile pending; SDL_Timer *pending;
SDL_Timer * volatile freelist; SDL_Timer *freelist;
volatile SDL_bool active; SDL_atomic_t active;
/* List of timers - this is only touched by the timer thread */ /* List of timers - this is only touched by the timer thread */
SDL_Timer *timers; SDL_Timer *timers;
@@ -138,7 +138,7 @@ SDL_TimerThread(void *_data)
freelist_tail = NULL; freelist_tail = NULL;
/* Check to see if we're still running, after maintenance */ /* Check to see if we're still running, after maintenance */
if (!data->active) { if (!SDL_AtomicGet(&data->active)) {
break; break;
} }
@@ -160,7 +160,7 @@ SDL_TimerThread(void *_data)
/* We're going to do something with this timer */ /* We're going to do something with this timer */
data->timers = current->next; data->timers = current->next;
if (current->canceled) { if (SDL_AtomicGet(&current->canceled)) {
interval = 0; interval = 0;
} else { } else {
interval = current->callback(current->interval, current->param); interval = current->callback(current->interval, current->param);
@@ -179,7 +179,7 @@ SDL_TimerThread(void *_data)
} }
freelist_tail = current; freelist_tail = current;
current->canceled = SDL_TRUE; SDL_AtomicSet(&current->canceled, 1);
} }
} }
@@ -207,7 +207,7 @@ SDL_TimerInit(void)
{ {
SDL_TimerData *data = &SDL_timer_data; SDL_TimerData *data = &SDL_timer_data;
if (!data->active) { if (!SDL_AtomicGet(&data->active)) {
const char *name = "SDLTimer"; const char *name = "SDLTimer";
data->timermap_lock = SDL_CreateMutex(); data->timermap_lock = SDL_CreateMutex();
if (!data->timermap_lock) { if (!data->timermap_lock) {
@@ -220,7 +220,7 @@ SDL_TimerInit(void)
return -1; return -1;
} }
data->active = SDL_TRUE; SDL_AtomicSet(&data->active, 1);
/* !!! FIXME: this is nasty. */ /* !!! FIXME: this is nasty. */
#if defined(__WIN32__) && !defined(HAVE_LIBC) #if defined(__WIN32__) && !defined(HAVE_LIBC)
#undef SDL_CreateThread #undef SDL_CreateThread
@@ -249,9 +249,7 @@ SDL_TimerQuit(void)
SDL_Timer *timer; SDL_Timer *timer;
SDL_TimerMap *entry; SDL_TimerMap *entry;
if (data->active) { if (SDL_AtomicCAS(&data->active, 1, 0)) { /* active? Move to inactive. */
data->active = SDL_FALSE;
/* Shutdown the timer thread */ /* Shutdown the timer thread */
if (data->thread) { if (data->thread) {
SDL_SemPost(data->sem); SDL_SemPost(data->sem);
@@ -291,21 +289,14 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
SDL_Timer *timer; SDL_Timer *timer;
SDL_TimerMap *entry; SDL_TimerMap *entry;
if (!data->active) { SDL_AtomicLock(&data->lock);
int status = 0; if (!SDL_AtomicGet(&data->active)) {
if (SDL_TimerInit() < 0) {
SDL_AtomicLock(&data->lock); SDL_AtomicUnlock(&data->lock);
if (!data->active) {
status = SDL_TimerInit();
}
SDL_AtomicUnlock(&data->lock);
if (status < 0) {
return 0; return 0;
} }
} }
SDL_AtomicLock(&data->lock);
timer = data->freelist; timer = data->freelist;
if (timer) { if (timer) {
data->freelist = timer->next; data->freelist = timer->next;
@@ -326,7 +317,7 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
timer->param = param; timer->param = param;
timer->interval = interval; timer->interval = interval;
timer->scheduled = SDL_GetTicks() + interval; timer->scheduled = SDL_GetTicks() + interval;
timer->canceled = SDL_FALSE; SDL_AtomicSet(&timer->canceled, 0);
entry = (SDL_TimerMap *)SDL_malloc(sizeof(*entry)); entry = (SDL_TimerMap *)SDL_malloc(sizeof(*entry));
if (!entry) { if (!entry) {
@@ -377,8 +368,8 @@ SDL_RemoveTimer(SDL_TimerID id)
SDL_UnlockMutex(data->timermap_lock); SDL_UnlockMutex(data->timermap_lock);
if (entry) { if (entry) {
if (!entry->timer->canceled) { if (!SDL_AtomicGet(&entry->timer->canceled)) {
entry->timer->canceled = SDL_TRUE; SDL_AtomicSet(&entry->timer->canceled, 1);
canceled = SDL_TRUE; canceled = SDL_TRUE;
} }
SDL_free(entry); SDL_free(entry);

2
src/video/android/SDL_androidtouch.c
View File

@@ -50,7 +50,7 @@ static void Android_GetWindowCoordinates(float x, float y,
*window_y = (int)(y * window_h); *window_y = (int)(y * window_h);
} }
static volatile SDL_bool separate_mouse_and_touch = SDL_FALSE; static SDL_bool separate_mouse_and_touch = SDL_FALSE;
static void static void
SeparateEventsHintWatcher(void *userdata, const char *name, SeparateEventsHintWatcher(void *userdata, const char *name,

12
test/testatomic.c
View File

@@ -284,7 +284,7 @@ typedef struct
char cache_pad4[SDL_CACHELINE_SIZE-sizeof(SDL_SpinLock)-2*sizeof(SDL_atomic_t)]; char cache_pad4[SDL_CACHELINE_SIZE-sizeof(SDL_SpinLock)-2*sizeof(SDL_atomic_t)];
#endif #endif
volatile SDL_bool active; SDL_atomic_t active;
/* Only needed for the mutex test */ /* Only needed for the mutex test */
SDL_mutex *mutex; SDL_mutex *mutex;
@@ -305,7 +305,7 @@ static void InitEventQueue(SDL_EventQueue *queue)
SDL_AtomicSet(&queue->rwcount, 0); SDL_AtomicSet(&queue->rwcount, 0);
SDL_AtomicSet(&queue->watcher, 0); SDL_AtomicSet(&queue->watcher, 0);
#endif #endif
queue->active = SDL_TRUE; SDL_AtomicSet(&queue->active, 1);
} }
static SDL_bool EnqueueEvent_LockFree(SDL_EventQueue *queue, const SDL_Event *event) static SDL_bool EnqueueEvent_LockFree(SDL_EventQueue *queue, const SDL_Event *event)
@@ -538,7 +538,7 @@ static int FIFO_Reader(void* _data)
if (DequeueEvent_LockFree(queue, &event)) { if (DequeueEvent_LockFree(queue, &event)) {
WriterData *writer = (WriterData*)event.user.data1; WriterData *writer = (WriterData*)event.user.data1;
++data->counters[writer->index]; ++data->counters[writer->index];
} else if (queue->active) { } else if (SDL_AtomicGet(&queue->active)) {
++data->waits; ++data->waits;
SDL_Delay(0); SDL_Delay(0);
} else { } else {
@@ -551,7 +551,7 @@ static int FIFO_Reader(void* _data)
if (DequeueEvent_Mutex(queue, &event)) { if (DequeueEvent_Mutex(queue, &event)) {
WriterData *writer = (WriterData*)event.user.data1; WriterData *writer = (WriterData*)event.user.data1;
++data->counters[writer->index]; ++data->counters[writer->index];
} else if (queue->active) { } else if (SDL_AtomicGet(&queue->active)) {
++data->waits; ++data->waits;
SDL_Delay(0); SDL_Delay(0);
} else { } else {
@@ -571,7 +571,7 @@ static int FIFO_Watcher(void* _data)
{ {
SDL_EventQueue *queue = (SDL_EventQueue *)_data; SDL_EventQueue *queue = (SDL_EventQueue *)_data;
while (queue->active) { while (SDL_AtomicGet(&queue->active)) {
SDL_AtomicLock(&queue->lock); SDL_AtomicLock(&queue->lock);
SDL_AtomicIncRef(&queue->watcher); SDL_AtomicIncRef(&queue->watcher);
while (SDL_AtomicGet(&queue->rwcount) > 0) { while (SDL_AtomicGet(&queue->rwcount) > 0) {
@@ -652,7 +652,7 @@ static void RunFIFOTest(SDL_bool lock_free)
} }
/* Shut down the queue so readers exit */ /* Shut down the queue so readers exit */
queue.active = SDL_FALSE; SDL_AtomicSet(&queue.active, 0);
/* Wait for the readers */ /* Wait for the readers */
while (SDL_AtomicGet(&readersRunning) > 0) { while (SDL_AtomicGet(&readersRunning) > 0) {

12
test/testlock.c
View File

@@ -23,7 +23,7 @@
static SDL_mutex *mutex = NULL; static SDL_mutex *mutex = NULL;
static SDL_threadID mainthread; static SDL_threadID mainthread;
static SDL_Thread *threads[6]; static SDL_Thread *threads[6];
static volatile int doterminate = 0; static SDL_atomic_t doterminate;
/* /*
* SDL_Quit() shouldn't be used with atexit() directly because * SDL_Quit() shouldn't be used with atexit() directly because
@@ -45,7 +45,7 @@ void
terminate(int sig) terminate(int sig)
{ {
signal(SIGINT, terminate); signal(SIGINT, terminate);
doterminate = 1; SDL_AtomicSet(&doterminate, 1);
} }
void void
@@ -54,7 +54,7 @@ closemutex(int sig)
SDL_threadID id = SDL_ThreadID(); SDL_threadID id = SDL_ThreadID();
int i; int i;
SDL_Log("Process %lu: Cleaning up...\n", id == mainthread ? 0 : id); SDL_Log("Process %lu: Cleaning up...\n", id == mainthread ? 0 : id);
doterminate = 1; SDL_AtomicSet(&doterminate, 1);
for (i = 0; i < 6; ++i) for (i = 0; i < 6; ++i)
SDL_WaitThread(threads[i], NULL); SDL_WaitThread(threads[i], NULL);
SDL_DestroyMutex(mutex); SDL_DestroyMutex(mutex);
@@ -66,7 +66,7 @@ Run(void *data)
{ {
if (SDL_ThreadID() == mainthread) if (SDL_ThreadID() == mainthread)
signal(SIGTERM, closemutex); signal(SIGTERM, closemutex);
while (!doterminate) { while (!SDL_AtomicGet(&doterminate)) {
SDL_Log("Process %lu ready to work\n", SDL_ThreadID()); SDL_Log("Process %lu ready to work\n", SDL_ThreadID());
if (SDL_LockMutex(mutex) < 0) { if (SDL_LockMutex(mutex) < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't lock mutex: %s", SDL_GetError()); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't lock mutex: %s", SDL_GetError());
@@ -82,7 +82,7 @@ Run(void *data)
/* If this sleep isn't done, then threads may starve */ /* If this sleep isn't done, then threads may starve */
SDL_Delay(10); SDL_Delay(10);
} }
if (SDL_ThreadID() == mainthread && doterminate) { if (SDL_ThreadID() == mainthread && SDL_AtomicGet(&doterminate)) {
SDL_Log("Process %lu: raising SIGTERM\n", SDL_ThreadID()); SDL_Log("Process %lu: raising SIGTERM\n", SDL_ThreadID());
raise(SIGTERM); raise(SIGTERM);
} }
@@ -105,6 +105,8 @@ main(int argc, char *argv[])
} }
atexit(SDL_Quit_Wrapper); atexit(SDL_Quit_Wrapper);
SDL_AtomicSet(&doterminate, 0);
if ((mutex = SDL_CreateMutex()) == NULL) { if ((mutex = SDL_CreateMutex()) == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create mutex: %s\n", SDL_GetError()); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create mutex: %s\n", SDL_GetError());
exit(1); exit(1);

11
test/testmultiaudio.c
View File

@@ -25,7 +25,7 @@ typedef struct
{ {
SDL_AudioDeviceID dev; SDL_AudioDeviceID dev;
int soundpos; int soundpos;
volatile int done; SDL_atomic_t done;
} callback_data; } callback_data;
callback_data cbd[64]; callback_data cbd[64];
@@ -46,14 +46,14 @@ play_through_once(void *arg, Uint8 * stream, int len)
if (len > 0) { if (len > 0) {
stream += cpy; stream += cpy;
SDL_memset(stream, spec.silence, len); SDL_memset(stream, spec.silence, len);
cbd->done++; SDL_AtomicSet(&cbd->done, 1);
} }
} }
void void
loop() loop()
{ {
if(cbd[0].done) { if (SDL_AtomicGet(&cbd[0].done)) {
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
emscripten_cancel_main_loop(); emscripten_cancel_main_loop();
#endif #endif
@@ -100,8 +100,7 @@ test_multi_audio(int devcount)
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
emscripten_set_main_loop(loop, 0, 1); emscripten_set_main_loop(loop, 0, 1);
#else #else
while (!cbd[0].done) while (!SDL_AtomicGet(&cbd[0].done)) {
{
#ifdef __ANDROID__ #ifdef __ANDROID__
/* Empty queue, some application events would prevent pause. */ /* Empty queue, some application events would prevent pause. */
while (SDL_PollEvent(&event)){} while (SDL_PollEvent(&event)){}
@@ -136,7 +135,7 @@ test_multi_audio(int devcount)
while (keep_going) { while (keep_going) {
keep_going = 0; keep_going = 0;
for (i = 0; i < devcount; i++) { for (i = 0; i < devcount; i++) {
if ((cbd[i].dev) && (!cbd[i].done)) { if ((cbd[i].dev) && (!SDL_AtomicGet(&cbd[i].done))) {
keep_going = 1; keep_going = 1;
} }
} }

8
test/torturethread.c
View File

@@ -21,7 +21,7 @@
#define NUMTHREADS 10 #define NUMTHREADS 10
static char volatile time_for_threads_to_die[NUMTHREADS]; static SDL_atomic_t time_for_threads_to_die[NUMTHREADS];
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
static void static void
@@ -58,7 +58,7 @@ ThreadFunc(void *data)
} }
SDL_Log("Thread '%d' waiting for signal\n", tid); SDL_Log("Thread '%d' waiting for signal\n", tid);
while (time_for_threads_to_die[tid] != 1) { while (SDL_AtomicGet(&time_for_threads_to_die[tid]) != 1) {
; /* do nothing */ ; /* do nothing */
} }
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
for (i = 0; i < NUMTHREADS; i++) { for (i = 0; i < NUMTHREADS; i++) {
char name[64]; char name[64];
SDL_snprintf(name, sizeof (name), "Parent%d", i); SDL_snprintf(name, sizeof (name), "Parent%d", i);
time_for_threads_to_die[i] = 0; SDL_AtomicSet(&time_for_threads_to_die[i], 0);
threads[i] = SDL_CreateThread(ThreadFunc, name, (void*) (uintptr_t) i); threads[i] = SDL_CreateThread(ThreadFunc, name, (void*) (uintptr_t) i);
if (threads[i] == NULL) { if (threads[i] == NULL) {
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
} }
for (i = 0; i < NUMTHREADS; i++) { for (i = 0; i < NUMTHREADS; i++) {
time_for_threads_to_die[i] = 1; SDL_AtomicSet(&time_for_threads_to_die[i], 1);
} }
for (i = 0; i < NUMTHREADS; i++) { for (i = 0; i < NUMTHREADS; i++) {