Mercurial > sdl-ios-xcode
diff test/testhread.c @ 1151:be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
if SDL is built with a non-cdecl calling convention, and it's just generally
bad practice anyhow.
Now programs explicitly call SDL_Quit() where appropriate, wrap SDL_Quit() in
a cdecl function where it can't be avoided, and rely on the parachute where
a crash might have hit the atexit() before (these ARE test programs, after
all!).
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 28 Sep 2005 11:36:20 +0000 |
| parents | 74212992fb08 |
| children | 14717b52abc0 |
line wrap: on
line diff
--- a/test/testhread.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testhread.c Wed Sep 28 11:36:20 2005 +0000 @@ -10,6 +10,13 @@ static int alive = 0; +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + int ThreadFunc(void *data) { printf("Started thread %s: My thread id is %u\n", @@ -27,7 +34,7 @@ printf("Killed with SIGTERM, waiting 5 seconds to exit\n"); SDL_Delay(5*1000); alive = 0; - exit(0); + quit(0); } int main(int argc, char *argv[]) @@ -37,15 +44,14 @@ /* Load the SDL library */ if ( SDL_Init(0) < 0 ) { fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); - exit(1); + return(1); } - atexit(SDL_Quit); alive = 1; thread = SDL_CreateThread(ThreadFunc, "#1"); if ( thread == NULL ) { fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); - exit(1); + quit(1); } SDL_Delay(5*1000); printf("Waiting for thread #1\n"); @@ -56,7 +62,7 @@ thread = SDL_CreateThread(ThreadFunc, "#2"); if ( thread == NULL ) { fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); - exit(1); + quit(1); } SDL_Delay(5*1000); printf("Killing thread #2\n"); @@ -67,9 +73,10 @@ thread = SDL_CreateThread(ThreadFunc, "#3"); if ( thread == NULL ) { fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); - exit(1); + quit(1); } raise(SIGTERM); + SDL_Quit(); /* Never reached */ return(0); /* Never reached */ }