Mercurial > hg > dmlib
annotate src/dmlib.c @ 957:b66653c9acb3
Oops, forgot to add const in the actual function .. 100L.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 27 Feb 2015 02:21:57 +0200 |
| parents | 6b2f41844580 |
| children | 985225a93aeb |
| rev | line source |
|---|---|
| 0 | 1 #include "dmlib.h" |
| 2 #include <errno.h> | |
| 3 | |
| 4 | |
| 5 int dmVerbosity = 0; | |
| 6 char *dmProgName = NULL, | |
| 7 *dmProgDesc = NULL, | |
| 8 *dmProgVersion = NULL, | |
| 9 *dmProgAuthor = NULL, | |
| 10 *dmProgLicense = NULL; | |
| 11 | |
| 12 | |
| 13 void dmInitProg(char *name, char *desc, char *version, char *author, char *license) | |
| 14 { | |
| 15 dmProgName = name; | |
| 16 dmProgDesc = desc; | |
| 17 dmProgVersion = version; | |
| 804 | 18 dmProgAuthor = author ? author : DM_PROG_AUTHOR; |
| 19 dmProgLicense = license ? license : DM_PROG_LICENSE; | |
| 0 | 20 } |
| 21 | |
| 22 | |
| 23 void dmPrintBanner(FILE *outFile, const char *name, const char *usage) | |
| 24 { | |
| 25 fprintf(outFile, | |
| 804 | 26 "\n%s v%s (%s)\n" |
| 27 "%s\n" | |
| 28 "%s\n" | |
| 29 "Usage: %s %s\n", | |
| 30 dmProgName, dmProgVersion, dmProgDesc, | |
| 31 dmProgAuthor, dmProgLicense, name, usage); | |
| 0 | 32 } |
| 33 | |
| 34 | |
| 35 void dmMsgVA(int level, const char *fmt, va_list ap) | |
| 36 { | |
| 37 if (dmVerbosity >= level) | |
| 38 { | |
| 39 fprintf(stderr, "%s: ", dmProgName); | |
| 40 vfprintf(stderr, fmt, ap); | |
| 41 } | |
| 42 } | |
| 43 | |
| 44 | |
| 45 void dmPrintVA(int level, const char *fmt, va_list ap) | |
| 46 { | |
| 47 if (dmVerbosity >= level) | |
| 48 { | |
| 49 vfprintf(stderr, fmt, ap); | |
| 50 } | |
| 51 } | |
| 52 | |
| 53 | |
| 54 void dmErrorVA(const char *fmt, va_list ap) | |
| 55 { | |
| 56 fprintf(stderr, "%s: ", dmProgName); | |
| 57 vfprintf(stderr, fmt, ap); | |
| 58 } | |
| 59 | |
| 60 | |
| 61 void dmError(const char *fmt, ...) | |
| 62 { | |
| 63 va_list ap; | |
| 64 | |
| 65 va_start(ap, fmt); | |
| 66 dmErrorVA(fmt, ap); | |
| 67 va_end(ap); | |
| 68 } | |
| 69 | |
| 70 | |
| 71 void dmMsg(int level, const char *fmt, ...) | |
| 72 { | |
| 73 va_list ap; | |
| 74 | |
| 75 va_start(ap, fmt); | |
| 76 dmMsgVA(level, fmt, ap); | |
| 77 va_end(ap); | |
| 78 } | |
| 79 | |
| 80 | |
| 81 void dmPrint(int level, const char *fmt, ...) | |
| 82 { | |
| 83 va_list ap; | |
| 84 | |
| 85 va_start(ap, fmt); | |
| 86 dmPrintVA(level, fmt, ap); | |
| 87 va_end(ap); | |
| 88 } | |
| 89 | |
| 90 | |
| 91 /* Memory handling routines | |
| 92 */ | |
| 93 void *dmMalloc(size_t l) | |
| 94 { | |
| 95 return malloc(l); | |
| 96 } | |
| 97 | |
| 98 | |
| 99 void *dmMalloc0(size_t l) | |
| 100 { | |
| 101 return calloc(1, l); | |
| 102 } | |
| 103 | |
| 104 | |
| 105 void *dmCalloc(size_t n, size_t l) | |
| 106 { | |
| 107 return calloc(n, l); | |
| 108 } | |
| 109 | |
| 110 | |
| 111 void *dmRealloc(void *p, size_t l) | |
| 112 { | |
| 113 return realloc(p, l); | |
| 114 } | |
| 115 | |
| 116 | |
| 117 void dmFree(void *p) | |
| 118 { | |
| 119 /* Check for NULL pointers for portability due to some libc | |
| 120 * implementations not handling free(NULL) too well. | |
| 121 */ | |
| 122 if (p) free(p); | |
| 123 } | |
| 124 | |
| 125 | |
|
871
fc272f5f2d15
Make value type of dmGetIntVal() unsigned.
Matti Hamalainen <ccr@tnsp.org>
parents:
812
diff
changeset
|
126 BOOL dmGetIntVal(const char *s, unsigned int *i) |
| 0 | 127 { |
| 128 if (s[0] == '$') | |
| 129 { | |
| 130 if (sscanf(&s[1], "%x", i) < 1) | |
| 131 return FALSE; | |
| 132 } | |
| 133 else if (s[0] == '0' && s[1] == 'x') | |
| 134 { | |
| 135 if (sscanf(&s[2], "%x", i) < 1) | |
| 136 return FALSE; | |
| 137 } | |
| 138 else | |
| 139 { | |
| 140 if (sscanf(s, "%u", i) < 1) | |
| 141 return FALSE; | |
| 142 } | |
| 143 return TRUE; | |
| 144 } | |
| 145 | |
| 146 | |
| 955 | 147 /* |
| 148 * Error handling and messages | |
| 0 | 149 */ |
| 150 #define DM_SYSTEM_ERRORS 100000 | |
| 151 | |
| 955 | 152 |
| 0 | 153 int dmGetErrno() |
| 154 { | |
| 155 return DM_SYSTEM_ERRORS + errno; | |
| 156 } | |
| 157 | |
| 158 | |
|
957
b66653c9acb3
Oops, forgot to add const in the actual function .. 100L.
Matti Hamalainen <ccr@tnsp.org>
parents:
955
diff
changeset
|
159 const char *dmErrorStr(const int error) |
| 0 | 160 { |
| 161 if (error >= DM_SYSTEM_ERRORS) | |
| 162 return strerror(error - DM_SYSTEM_ERRORS); | |
| 163 | |
| 164 switch (error) | |
| 165 { | |
| 166 case DMERR_OK: return "No error"; | |
| 167 case DMERR_FOPEN: return "File open error"; | |
| 168 case DMERR_FREAD: return "Read error"; | |
| 169 case DMERR_FWRITE: return "Write error"; | |
| 170 case DMERR_FSEEK: return "Seek error"; | |
| 171 case DMERR_NOT_FOUND: return "Resource not found"; | |
| 172 | |
| 173 case DMERR_INVALID_DATA: return "Invalid data"; | |
| 174 case DMERR_MALLOC: return "Memory allocation failure"; | |
| 175 case DMERR_ALREADY_INIT: return "Already initialized"; | |
| 176 case DMERR_INIT_FAIL: return "Initialization failed"; | |
| 177 case DMERR_INVALID_ARGS: return "Invalid arguments"; | |
| 178 | |
| 179 case DMERR_NULLPTR: return "NULL pointer"; | |
| 180 case DMERR_NOT_SUPPORTED: return "Operation not supported"; | |
| 181 case DMERR_OUT_OF_DATA: return "Out of data"; | |
| 182 case DMERR_EXTRA_DATA: return "Extra data"; | |
| 183 case DMERR_BOUNDS: return "Bounds check failed"; | |
| 184 | |
|
908
03bda6477ad4
Add new error code DMERR_DATA_ERROR.
Matti Hamalainen <ccr@tnsp.org>
parents:
871
diff
changeset
|
185 case DMERR_DATA_ERROR: return "Data decoding/encoding/parsing error"; |
|
03bda6477ad4
Add new error code DMERR_DATA_ERROR.
Matti Hamalainen <ccr@tnsp.org>
parents:
871
diff
changeset
|
186 |
| 0 | 187 case DMERR_NOTPACK: return "File is not a PACK"; |
| 188 case DMERR_VERSION: return "Unsupported PACK version"; | |
| 189 case DMERR_INVALID: return "Invalid data, corrupted file"; | |
| 190 case DMERR_COMPRESSION: return "Error in compression"; | |
| 191 | |
| 192 default: return "Unknown error"; | |
| 193 } | |
| 194 } | |
|
294
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
195 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
196 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
197 #ifdef DM_MUTEX_DEBUG |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
198 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
199 static DMMutexLock * dmGetMutexThreadIDLock(DMMutex *mutex) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
200 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
201 Uint32 id = SDL_ThreadID(); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
202 int i; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
203 for (i = 0; i < 8; i++) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
204 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
205 DMMutexLock *lock = &(mutex->locks[i]); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
206 if (lock->used && lock->id == id) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
207 return lock; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
208 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
209 return NULL; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
210 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
211 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
212 static void dmPrintMutexLocks(DMMutex *mutex, const char *state, const char *file, const int line) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
213 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
214 int i; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
215 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
216 fprintf(stderr, |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
217 "----------------------\n" |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
218 "%s --> %p @ %s:%d\n" |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
219 "Current thread: %d\n" |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
220 "Mutex : %p (created @ %s:%d)\n", |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
221 state, mutex, file, line, |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
222 SDL_ThreadID(), mutex, mutex->cr_file, mutex->cr_line); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
223 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
224 for (i = 0; i < 8; i++) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
225 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
226 DMMutexLock *lock = &(mutex->locks[i]); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
227 if (lock->used) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
228 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
229 fprintf(stderr, |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
230 "Lock #%d: thread=%d, state=%d\n", |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
231 i, lock->id, lock->state); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
232 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
233 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
234 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
235 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
236 int dmDOMutexLock(DMMutex *mutex, const char *file, const int line) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
237 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
238 if (mutex != NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
239 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
240 dmPrintMutexLocks(mutex, "LOCKING", file, line); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
241 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
242 DMMutexLock *lock = dmGetMutexThreadIDLock(mutex); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
243 if (lock != NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
244 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
245 int res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
246 if (lock->state == 0) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
247 res = SDL_mutexP(mutex->m); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
248 else |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
249 res = 1; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
250 lock->state++; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
251 fprintf(stderr, "LOCKING %p @ thread=%d done [1].\n", mutex, SDL_ThreadID()); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
252 return res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
253 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
254 else |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
255 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
256 int i; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
257 for (i = 0; i < 8; i++) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
258 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
259 DMMutexLock *lock = &(mutex->locks[i]); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
260 if (!lock->used) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
261 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
262 int res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
263 lock->used = TRUE; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
264 lock->id = SDL_ThreadID(); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
265 lock->state++; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
266 res = SDL_mutexP(mutex->m); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
267 fprintf(stderr, "LOCKING %p @ thread=%d done [2].\n", mutex, SDL_ThreadID()); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
268 return res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
269 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
270 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
271 return -2; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
272 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
273 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
274 return -1; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
275 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
276 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
277 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
278 int dmDOMutexUnlock(DMMutex *mutex, const char *file, const int line) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
279 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
280 if (mutex != NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
281 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
282 dmPrintMutexLocks(mutex, "UN-LOCKING", file, line); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
283 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
284 DMMutexLock *lock = dmGetMutexThreadIDLock(mutex); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
285 if (lock != NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
286 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
287 int res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
288 lock->state--; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
289 if (lock->state == 0) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
290 res = SDL_mutexV(mutex->m); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
291 else |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
292 res = lock->state; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
293 return res; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
294 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
295 else |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
296 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
297 return -2; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
298 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
299 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
300 return -1; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
301 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
302 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
303 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
304 DMMutex * dmDOCreateMutex(const char *file, const int line) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
305 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
306 DMMutex *mutex = dmMalloc0(sizeof(DMMutex)); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
307 if (mutex == NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
308 return NULL; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
309 mutex->cr_file = dm_strdup(file); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
310 mutex->cr_line = line; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
311 mutex->m = SDL_CreateMutex(); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
312 return mutex; |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
313 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
314 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
315 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
316 void dmDestroyMutex(DMMutex *mutex) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
317 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
318 if (mutex != NULL) |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
319 { |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
320 SDL_DestroyMutex(mutex->m); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
321 dmFree(mutex); |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
322 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
323 } |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
324 |
|
dd9809a93425
Improve mutex debugging facilities.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
325 #endif |