Mercurial > sdl-ios-xcode
annotate test/testhread.c @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 10 Mar 2010 15:04:13 +0000 |
| parents | 290b5baf2fca |
| children | 782fd950bd46 c121d94672cb |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 /* Simple test of the SDL threading code */ | |
| 3 | |
| 4 #include <stdio.h> | |
| 5 #include <stdlib.h> | |
| 6 #include <signal.h> | |
| 7 | |
| 8 #include "SDL.h" | |
| 9 #include "SDL_thread.h" | |
| 10 | |
| 11 static int alive = 0; | |
| 12 | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
13 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
14 static void quit(int rc) |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
15 { |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
16 SDL_Quit(); |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
17 exit(rc); |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
18 } |
|
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
19 |
| 1769 | 20 int SDLCALL ThreadFunc(void *data) |
| 0 | 21 { |
| 22 printf("Started thread %s: My thread id is %u\n", | |
| 23 (char *)data, SDL_ThreadID()); | |
| 24 while ( alive ) { | |
| 25 printf("Thread '%s' is alive!\n", (char *)data); | |
| 26 SDL_Delay(1*1000); | |
| 27 } | |
| 28 printf("Thread '%s' exiting!\n", (char *)data); | |
| 29 return(0); | |
| 30 } | |
| 31 | |
| 32 static void killed(int sig) | |
| 33 { | |
| 34 printf("Killed with SIGTERM, waiting 5 seconds to exit\n"); | |
| 35 SDL_Delay(5*1000); | |
| 36 alive = 0; | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
37 quit(0); |
| 0 | 38 } |
| 39 | |
| 40 int main(int argc, char *argv[]) | |
| 41 { | |
| 42 SDL_Thread *thread; | |
| 43 | |
| 44 /* Load the SDL library */ | |
| 45 if ( SDL_Init(0) < 0 ) { | |
| 46 fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
47 return(1); |
| 0 | 48 } |
| 49 | |
| 50 alive = 1; | |
| 51 thread = SDL_CreateThread(ThreadFunc, "#1"); | |
| 52 if ( thread == NULL ) { | |
| 53 fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
54 quit(1); |
| 0 | 55 } |
| 56 SDL_Delay(5*1000); | |
| 57 printf("Waiting for thread #1\n"); | |
| 58 alive = 0; | |
| 59 SDL_WaitThread(thread, NULL); | |
| 60 | |
| 61 alive = 1; | |
| 62 thread = SDL_CreateThread(ThreadFunc, "#2"); | |
| 63 if ( thread == NULL ) { | |
| 64 fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
65 quit(1); |
| 0 | 66 } |
| 67 SDL_Delay(5*1000); | |
| 68 printf("Killing thread #2\n"); | |
| 69 SDL_KillThread(thread); | |
| 70 | |
| 71 alive = 1; | |
| 72 signal(SIGTERM, killed); | |
| 73 thread = SDL_CreateThread(ThreadFunc, "#3"); | |
| 74 if ( thread == NULL ) { | |
| 75 fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError()); | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
76 quit(1); |
| 0 | 77 } |
| 78 raise(SIGTERM); | |
| 79 | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
0
diff
changeset
|
80 SDL_Quit(); /* Never reached */ |
| 0 | 81 return(0); /* Never reached */ |
| 82 } |