Overview
Comment: | Write a warning to stderr if objc_sync_{enter,exit} fails. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
216caca8a0f3ced61de1bb0d71fbb75f |
User & Date: | js on 2009-06-01 12:02:19 |
Other Links: | manifest | tags |
Context
2009-06-01
| ||
12:20 | Add +[conformsTo:] and -[conformsTo:]. check-in: 5008910e85 user: js tags: trunk | |
12:02 | Write a warning to stderr if objc_sync_{enter,exit} fails. check-in: 216caca8a0 user: js tags: trunk | |
04:08 | Optimize OFMutex on Win32 and add missing -[dealloc]. check-in: ddcee670e4 user: js tags: trunk | |
Changes
Modified src/objc_sync.m from [dc3b3466a2] to [5b0b24464d].
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #include "config.h" | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> #ifndef _WIN32 #include <pthread.h> #endif |
︙ | ︙ | |||
69 70 71 72 73 74 75 | static OF_INLINE BOOL mutex_unlock(pthread_mutex_t *m) { return (pthread_mutex_unlock(m) ? NO : YES); } | < < < | < < < | < < < | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | static OF_INLINE BOOL mutex_unlock(pthread_mutex_t *m) { return (pthread_mutex_unlock(m) ? NO : YES); } #define thread_is_current(t) pthread_equal(t, pthread_self()) #define thread_current() pthread_self() #else static OF_INLINE BOOL mutex_new(CRITICAL_SECTION *m) { InitializeCriticalSection(m); return YES; } |
︙ | ︙ | |||
109 110 111 112 113 114 115 | static OF_INLINE BOOL mutex_unlock(CRITICAL_SECTION *m) { LeaveCriticalSection(m); return YES; } | < | < | > | | < < | > > > | | < | | | | | < > | | | | | | | | | | | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | static OF_INLINE BOOL mutex_unlock(CRITICAL_SECTION *m) { LeaveCriticalSection(m); return YES; } #define thread_is_current(t) (t == GetCurrentThreadId()) #define thread_current() GetCurrentThreadId() #endif #define ERROR(f) \ { \ fprintf(stderr, "WARNING: %s failed in line %d!\n" \ "WARNING: This might result in a race " \ "condition!\n", f, __LINE__); \ return 1; \ } BOOL objc_sync_init() { return (mutex_new(&mutex) ? YES : NO); } int objc_sync_enter(id obj) { int i; if (obj == nil) return 0; if (!mutex_lock(&mutex)) ERROR("mutex_lock(&mutex)"); for (i = num_locks - 1; i >= 0; i--) { if (locks[i].obj == obj) { if (thread_is_current(locks[i].thread)) locks[i].recursion++; else { /* Make sure objc_sync_exit doesn't free it */ locks[i].count++; /* Unlock so objc_sync_exit can return */ if (!mutex_unlock(&mutex)) ERROR("mutex_unlock(&mutex)"); if (!mutex_lock(&locks[i].mutex)) { mutex_unlock(&mutex); ERROR("mutex_lock(&locks[i].mutex"); } if (!mutex_lock(&mutex)) ERROR("mutex_lock(&mutex)"); assert(locks[i].recursion == 0); /* Update lock's active thread */ locks[i].thread = thread_current(); } if (!mutex_unlock(&mutex)) ERROR("mutex_unlock(&mutex)"); return 0; } } if (locks == NULL) { if ((locks = malloc(sizeof(struct locks_s))) == NULL) { mutex_unlock(&mutex); ERROR("malloc(...)"); } } else { struct locks_s *new_locks; if ((new_locks = realloc(locks, (num_locks + 1) * sizeof(struct locks_s))) == NULL) { mutex_unlock(&mutex); ERROR("realloc(...)"); } locks = new_locks; } locks[num_locks].obj = obj; locks[num_locks].count = 1; locks[num_locks].recursion = 0; locks[num_locks].thread = thread_current(); if (!mutex_new(&locks[num_locks].mutex)) { mutex_unlock(&mutex); ERROR("mutex_new(&locks[num_locks].mutex"); } if (!mutex_lock(&locks[num_locks].mutex)) { mutex_unlock(&mutex); ERROR("mutex_lock(&locks[num_locks].mutex"); } num_locks++; if (!mutex_unlock(&mutex)) ERROR("mutex_unlock(&mutex)"); return 0; } int objc_sync_exit(id obj) { int i; if (obj == nil) return 0; if (!mutex_lock(&mutex)) ERROR("mutex_lock(&mutex)"); for (i = num_locks - 1; i >= 0; i--) { if (locks[i].obj == obj) { if (locks[i].recursion > 0 && thread_is_current(locks[i].thread)) { locks[i].recursion--; if (!mutex_unlock(&mutex)) ERROR("mutex_unlock(&mutex)"); return 0; } if (!mutex_unlock(&locks[i].mutex)) { mutex_unlock(&mutex); ERROR("mutex_unlock(&locks[i].mutex)"); } locks[i].count--; if (locks[i].count == 0) { struct locks_s *new_locks = NULL; if (!mutex_free(&locks[i].mutex)) { mutex_unlock(&mutex); ERROR("mutex_free(&locks[i].mutex"); } num_locks--; locks[i] = locks[num_locks]; if (num_locks == 0) { free(locks); new_locks = NULL; } else if ((new_locks = realloc(locks, num_locks * sizeof(struct locks_s))) == NULL) { mutex_unlock(&mutex); ERROR("realloc(...)"); } locks = new_locks; } if (!mutex_unlock(&mutex)) ERROR("mutex_unlock(&mutex)"); return 0; } } mutex_unlock(&mutex); ERROR("objc_sync_exit()"); } |