Skip to content

Commit

Permalink
Use atomic variables for thread communication
Browse files Browse the repository at this point in the history
Fixes #10711

(cherry picked from commit a0f36fb)
(cherry picked from commit a75227a)
  • Loading branch information
slouken committed Sep 5, 2024
1 parent 85b2733 commit ba9b075
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
12 changes: 6 additions & 6 deletions test/testthread.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "SDL.h"

static SDL_TLSID tls;
static int alive = 0;
static SDL_atomic_t alive;
static int testprio = 0;

/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
Expand Down Expand Up @@ -55,7 +55,7 @@ ThreadFunc(void *data)
SDL_TLSSet(tls, "baby thread", NULL);
SDL_Log("Started thread %s: My thread id is %lu, thread data = %s\n",
(char *)data, SDL_ThreadID(), (const char *)SDL_TLSGet(tls));
while (alive) {
while (SDL_AtomicGet(&alive)) {
SDL_Log("Thread '%s' is alive!\n", (char *)data);

if (testprio) {
Expand All @@ -76,7 +76,7 @@ killed(int sig)
{
SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit\n");
SDL_Delay(5 * 1000);
alive = 0;
SDL_AtomicSet(&alive, 0);
quit(0);
}

Expand Down Expand Up @@ -112,20 +112,20 @@ int main(int argc, char *argv[])
SDL_TLSSet(tls, "main thread", NULL);
SDL_Log("Main thread data initially: %s\n", (const char *)SDL_TLSGet(tls));

alive = 1;
SDL_AtomicSet(&alive, 1);
thread = SDL_CreateThread(ThreadFunc, "One", "#1");
if (!thread) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
quit(1);
}
SDL_Delay(5 * 1000);
SDL_Log("Waiting for thread #1\n");
alive = 0;
SDL_AtomicSet(&alive, 0);
SDL_WaitThread(thread, NULL);

SDL_Log("Main thread data finally: %s\n", (const char *)SDL_TLSGet(tls));

alive = 1;
SDL_AtomicSet(&alive, 1);
(void)signal(SIGTERM, killed);
thread = SDL_CreateThread(ThreadFunc, "Two", "#2");
if (!thread) {
Expand Down
11 changes: 6 additions & 5 deletions test/torturethread.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ quit(int rc)
int SDLCALL
SubThreadFunc(void *data)
{
while (!*(int volatile *)data) {
; /* SDL_Delay(10); */ /* do nothing */
SDL_atomic_t *flag = (SDL_atomic_t *)data;
while (!SDL_AtomicGet(flag)) {
SDL_Delay(10);
}
return 0;
}
Expand All @@ -44,7 +45,7 @@ int SDLCALL
ThreadFunc(void *data)
{
SDL_Thread *sub_threads[NUMTHREADS];
int flags[NUMTHREADS];
SDL_atomic_t flags[NUMTHREADS];
int i;
int tid = (int)(uintptr_t)data;

Expand All @@ -53,7 +54,7 @@ ThreadFunc(void *data)
for (i = 0; i < NUMTHREADS; i++) {
char name[64];
(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]);
}

Expand All @@ -64,7 +65,7 @@ ThreadFunc(void *data)

SDL_Log("Thread '%d' sending signals to subthreads\n", tid);
for (i = 0; i < NUMTHREADS; i++) {
flags[i] = 1;
SDL_AtomicSet(&flags[i], 1);
SDL_WaitThread(sub_threads[i], NULL);
}

Expand Down

0 comments on commit ba9b075

Please sign in to comment.