mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use atomic variables for thread communication 

Fixes https://github.com/libsdl-org/SDL/issues/10711
This commit is contained in:
Sam Lantinga 2024-09-05 05:35:03 -07:00
parent 41810c823d
commit a0f36fb85b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/testthread.c
View File

@ -21,7 +21,7 @@
static SDL_TLSID tls; static SDL_TLSID tls;
static SDL_Thread *thread = NULL; static SDL_Thread *thread = NULL;
static int alive = 0; static SDL_AtomicInt alive;
static int testprio = 0; static int testprio = 0;
static SDLTest_CommonState *state; static SDLTest_CommonState *state;
@ -62,7 +62,7 @@ ThreadFunc(void *data)
SDL_SetTLS(&tls, "baby thread", NULL); SDL_SetTLS(&tls, "baby thread", NULL);
SDL_Log("Started thread %s: My thread id is %" SDL_PRIu64 ", thread data = %s\n", SDL_Log("Started thread %s: My thread id is %" SDL_PRIu64 ", thread data = %s\n",
(char *)data, SDL_GetCurrentThreadID(), (const char *)SDL_GetTLS(&tls)); (char *)data, SDL_GetCurrentThreadID(), (const char *)SDL_GetTLS(&tls));
while (alive) { while (SDL_AtomicGet(&alive)) {
SDL_Log("Thread '%s' is alive!\n", (char *)data); SDL_Log("Thread '%s' is alive!\n", (char *)data);
if (testprio) { if (testprio) {
@ -83,7 +83,7 @@ killed(int sig)
{ {
SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit\n"); SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit\n");
SDL_Delay(5 * 1000); SDL_Delay(5 * 1000);
alive = 0; SDL_AtomicSet(&alive, 0);
SDL_WaitThread(thread, NULL); SDL_WaitThread(thread, NULL);
quit(0); quit(0);
} }
@ -136,7 +136,7 @@ int main(int argc, char *argv[])
SDL_SetTLS(&tls, "main thread", NULL); SDL_SetTLS(&tls, "main thread", NULL);
SDL_Log("Main thread data initially: %s\n", (const char *)SDL_GetTLS(&tls)); SDL_Log("Main thread data initially: %s\n", (const char *)SDL_GetTLS(&tls));
alive = 1; SDL_AtomicSet(&alive, 1);
thread = SDL_CreateThread(ThreadFunc, "One", "#1"); thread = SDL_CreateThread(ThreadFunc, "One", "#1");
if (!thread) { if (!thread) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError()); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
@ -144,12 +144,12 @@ int main(int argc, char *argv[])
} }
SDL_Delay(5 * 1000); SDL_Delay(5 * 1000);
SDL_Log("Waiting for thread #1\n"); SDL_Log("Waiting for thread #1\n");
alive = 0; SDL_AtomicSet(&alive, 0);
SDL_WaitThread(thread, NULL); SDL_WaitThread(thread, NULL);
SDL_Log("Main thread data finally: %s\n", (const char *)SDL_GetTLS(&tls)); SDL_Log("Main thread data finally: %s\n", (const char *)SDL_GetTLS(&tls));
alive = 1; SDL_AtomicSet(&alive, 1);
(void)signal(SIGTERM, killed); (void)signal(SIGTERM, killed);
thread = SDL_CreateThread(ThreadFunc, "Two", "#2"); thread = SDL_CreateThread(ThreadFunc, "Two", "#2");
if (!thread) { if (!thread) {

9
test/torturethread.c
View File

@ -37,7 +37,8 @@ quit(int rc)
static int SDLCALL static int SDLCALL
SubThreadFunc(void *data) SubThreadFunc(void *data)
{ {
while (!*(int volatile *)data) { SDL_AtomicInt *flag = (SDL_AtomicInt *)data;
while (!SDL_AtomicGet(flag)) {
SDL_Delay(10); SDL_Delay(10);
} }
return 0; return 0;
@ -47,7 +48,7 @@ static int SDLCALL
ThreadFunc(void *data) ThreadFunc(void *data)
{ {
SDL_Thread *sub_threads[NUMTHREADS]; SDL_Thread *sub_threads[NUMTHREADS];
int flags[NUMTHREADS]; SDL_AtomicInt flags[NUMTHREADS];
int i; int i;
int tid = (int)(uintptr_t)data; int tid = (int)(uintptr_t)data;
@ -56,7 +57,7 @@ ThreadFunc(void *data)
for (i = 0; i < NUMTHREADS; i++) { for (i = 0; i < NUMTHREADS; i++) {
char name[64]; char name[64];
(void)SDL_snprintf(name, sizeof(name), "Child%d_%d", tid, i); (void)SDL_snprintf(name, sizeof(name), "Child%d_%d", tid, i);
flags[i] = 0; SDL_AtomicSet(&flags[i], 0);
sub_threads[i] = SDL_CreateThread(SubThreadFunc, name, &flags[i]); sub_threads[i] = SDL_CreateThread(SubThreadFunc, name, &flags[i]);
} }
@ -67,7 +68,7 @@ ThreadFunc(void *data)
SDL_Log("Thread '%d' sending signals to subthreads\n", tid); SDL_Log("Thread '%d' sending signals to subthreads\n", tid);
for (i = 0; i < NUMTHREADS; i++) { for (i = 0; i < NUMTHREADS; i++) {
flags[i] = 1; SDL_AtomicSet(&flags[i], 1);
SDL_WaitThread(sub_threads[i], NULL); SDL_WaitThread(sub_threads[i], NULL);
} }