Mercurial > sdl-ios-xcode
annotate src/thread/amigaos/SDL_syssem.c @ 641:df178851293b
Date: 28 Jun 2003 22:42:52 +0100
From: Alan Swanson
Subject: Re: [SDL] New XFree 4.3 Video Mode Patch
I have a wee amendment that moves the qsort in set_best_resolution
to only occur after failing to find an exact match only. This would
make absolutely sure we get a user set mode.
While I've never had any problems for my normal resolutions (1280x1024,
1024x768, 800x600 & 640,480) while closely examining the output from
qsort I've noticed it doesn't seem to sort the modes fully. These is
one definite wrong at 1152x768 and a few that just look wrong to me.
From a program (attached) I made to examine this more easily. X has
sorted its mode list using the same method as ours (plus frequency),
and our user modes get inserted without any other movement.
On the patch I've made I've also changed cmpmodes to sort on vertical
resolution and then horizontal. Ie vertical is now most significant
bit.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 28 Jun 2003 21:52:26 +0000 |
| parents | f6ffac90895c |
| children | b8d311d90021 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
297
f6ffac90895c
Updated copyright information for 2002
Sam Lantinga <slouken@libsdl.org>
parents:
255
diff
changeset
|
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
21
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
28 /* An implementation of semaphores using mutexes and condition variables */ |
| 0 | 29 |
| 30 #include "SDL_error.h" | |
| 31 #include "SDL_thread.h" | |
| 32 #include "SDL_systhread_c.h" | |
| 33 | |
| 34 | |
| 35 struct SDL_semaphore | |
| 36 { | |
| 37 struct SignalSemaphore Sem; | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
38 Uint32 count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
39 Uint32 waiters_count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
40 SDL_mutex *count_lock; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
41 SDL_cond *count_nonzero; |
| 0 | 42 }; |
| 43 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
44 #undef D |
| 0 | 45 |
| 46 #define D(x) | |
| 47 | |
| 48 SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) | |
| 49 { | |
| 50 SDL_sem *sem; | |
| 51 | |
| 52 sem = (SDL_sem *)malloc(sizeof(*sem)); | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
53 |
| 0 | 54 if ( ! sem ) { |
| 55 SDL_OutOfMemory(); | |
| 56 return(0); | |
| 57 } | |
| 58 | |
| 59 D(bug("Creating semaphore %lx...\n",sem)); | |
| 60 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
61 memset(sem,0,sizeof(*sem)); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
62 |
| 0 | 63 InitSemaphore(&sem->Sem); |
|
255
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
64 |
| 0 | 65 return(sem); |
| 66 } | |
| 67 | |
| 68 void SDL_DestroySemaphore(SDL_sem *sem) | |
| 69 { | |
| 70 D(bug("Destroying semaphore %lx...\n",sem)); | |
| 71 | |
| 72 if ( sem ) { | |
| 73 // Condizioni per liberare i task in attesa? | |
| 74 free(sem); | |
| 75 } | |
| 76 } | |
| 77 | |
| 78 int SDL_SemTryWait(SDL_sem *sem) | |
| 79 { | |
| 80 if ( ! sem ) { | |
| 81 SDL_SetError("Passed a NULL semaphore"); | |
| 82 return -1; | |
| 83 } | |
| 84 | |
| 85 D(bug("TryWait semaphore...%lx\n",sem)); | |
| 86 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
87 ObtainSemaphore(&sem->Sem); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
88 // ReleaseSemaphore(&sem->Sem); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
89 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
90 return 1; |
| 0 | 91 } |
| 92 | |
| 93 int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) | |
| 94 { | |
| 95 int retval; | |
| 96 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
97 |
| 0 | 98 if ( ! sem ) { |
| 99 SDL_SetError("Passed a NULL semaphore"); | |
| 100 return -1; | |
| 101 } | |
| 102 | |
| 103 D(bug("WaitTimeout (%ld) semaphore...%lx\n",timeout,sem)); | |
| 104 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
105 /* A timeout of 0 is an easy case */ |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
106 if ( timeout == 0 ) { |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
107 return SDL_SemTryWait(sem); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
108 } |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
109 /* |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
110 SDL_LockMutex(sem->count_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
111 ++sem->waiters_count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
112 retval = 0; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
113 while ( (sem->count == 0) && (retval != SDL_MUTEX_TIMEDOUT) ) { |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
114 retval = SDL_CondWaitTimeout(sem->count_nonzero, |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
115 sem->count_lock, timeout); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
116 } |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
117 --sem->waiters_count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
118 --sem->count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
119 SDL_UnlockMutex(sem->count_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
120 */ |
| 0 | 121 if(!(retval=AttemptSemaphore(&sem->Sem))) |
| 122 { | |
| 123 SDL_Delay(timeout); | |
| 124 retval=AttemptSemaphore(&sem->Sem); | |
| 125 } | |
| 126 | |
| 127 if(retval==TRUE) | |
| 128 { | |
| 129 // ReleaseSemaphore(&sem->Sem); | |
| 130 retval=1; | |
| 131 } | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
132 |
| 0 | 133 return retval; |
| 134 } | |
| 135 | |
| 136 int SDL_SemWait(SDL_sem *sem) | |
| 137 { | |
| 138 ObtainSemaphore(&sem->Sem); | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
139 return 0; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
140 // return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT); |
| 0 | 141 } |
| 142 | |
| 143 Uint32 SDL_SemValue(SDL_sem *sem) | |
| 144 { | |
| 145 Uint32 value; | |
|
255
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
146 |
| 0 | 147 value = 0; |
| 148 if ( sem ) { | |
|
255
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
149 #ifdef STORMC4_WOS |
|
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
150 value = sem->Sem.ssppc_SS.ss_NestCount; |
|
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
151 #else |
| 0 | 152 value = sem->Sem.ss_NestCount; |
|
255
dcb5e869f8b5
Updated Amiga port by Gabriele Greco
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
153 #endif |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
154 // SDL_UnlockMutex(sem->count_lock); |
| 0 | 155 } |
| 156 return value; | |
| 157 } | |
| 158 | |
| 159 int SDL_SemPost(SDL_sem *sem) | |
| 160 { | |
| 161 if ( ! sem ) { | |
| 162 SDL_SetError("Passed a NULL semaphore"); | |
| 163 return -1; | |
| 164 } | |
| 165 D(bug("SemPost semaphore...%lx\n",sem)); | |
| 166 | |
| 167 ReleaseSemaphore(&sem->Sem); | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
168 #if 0 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
169 SDL_LockMutex(sem->count_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
170 if ( sem->waiters_count > 0 ) { |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
171 SDL_CondSignal(sem->count_nonzero); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
172 } |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
173 ++sem->count; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
174 SDL_UnlockMutex(sem->count_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
175 #endif |
| 0 | 176 return 0; |
| 177 } | |
| 178 |