Mercurial > sdl-ios-xcode
diff test/torturethread.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 | d93862a3d821 |
line wrap: on
line diff
--- a/test/torturethread.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/torturethread.c Wed Sep 28 11:36:20 2005 +0000 @@ -13,6 +13,13 @@ static char volatile time_for_threads_to_die[NUMTHREADS]; +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + int SubThreadFunc(void *data) { while(! *(int volatile *)data) { ; /*SDL_Delay(10); /* do nothing */ @@ -57,10 +64,8 @@ /* 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); - signal(SIGSEGV, SIG_DFL); for(i = 0; i < NUMTHREADS; i++) { @@ -70,7 +75,7 @@ if ( threads[i] == NULL ) { fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); - exit(1); + quit(1); } } @@ -81,5 +86,6 @@ for(i = NUMTHREADS-1; i >= 0; --i) { SDL_WaitThread(threads[i], NULL); } - return(0); /* Never reached */ + SDL_Quit(); + return(0); }