Overview
Comment: | Add support for zeroing weak references |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
03e6d6db9826cc6cce6cd7ce82c6d257 |
User & Date: | js on 2016-05-28 23:02:24 |
Other Links: | manifest | tags |
Context
2016-05-29
| ||
00:42 | Add -[{allows,retain}WeakReference] to OFObject check-in: 1d57af4a31 user: js tags: trunk | |
2016-05-28
| ||
23:02 | Add support for zeroing weak references check-in: 03e6d6db98 user: js tags: trunk | |
19:42 | OFStream: Free the right variable check-in: 28fe0a104d user: js tags: trunk | |
Changes
Modified src/instance.m from [73d4c6636f] to [9c022e876c].
︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 | } void* objc_destructInstance(id obj) { Class cls; void (*last)(id, SEL) = NULL; if (destructSel == NULL) destructSel = sel_registerName(".cxx_destruct"); for (cls = object_getClass(obj); cls != Nil; cls = class_getSuperclass(cls)) { void (*destruct)(id, SEL); | > > > > | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | } void* objc_destructInstance(id obj) { Class cls; void (*last)(id, SEL) = NULL; #ifdef OF_OBJFW_RUNTIME objc_zero_weak_references(obj); #endif if (destructSel == NULL) destructSel = sel_registerName(".cxx_destruct"); for (cls = object_getClass(obj); cls != Nil; cls = class_getSuperclass(cls)) { void (*destruct)(id, SEL); |
︙ | ︙ |
Modified src/runtime/arc.m from [c7cdb74fde] to [e3373421cc].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "runtime.h" #import "OFObject.h" #import "OFBlock.h" id objc_retain(id object) { return [object retain]; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "runtime.h" #import "runtime-private.h" #ifdef OF_HAVE_THREADS # import "threading.h" #endif #import "OFObject.h" #import "OFBlock.h" struct weak_ref { id **locations; size_t count; }; struct objc_hashtable *hashtable; #ifdef OF_HAVE_THREADS static of_spinlock_t spinlock; #endif static uint32_t obj_hash(const void *obj) { return (uint32_t)(uintptr_t)obj; } static bool obj_equal(const void *obj1, const void *obj2) { return (obj1 == obj2); } static void __attribute__((__constructor__)) init(void) { hashtable = objc_hashtable_new(obj_hash, obj_equal, 2); #ifdef OF_HAVE_THREADS if (!of_spinlock_new(&spinlock)) OBJC_ERROR("Failed to create spinlock!") #endif } id objc_retain(id object) { return [object retain]; } |
︙ | ︙ | |||
74 75 76 77 78 79 80 | { id old = *object; *object = objc_retain(value); objc_release(old); return value; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | { id old = *object; *object = objc_retain(value); objc_release(old); return value; } id objc_storeWeak(id *object, id value) { struct weak_ref *old; #ifdef OF_HAVE_THREADS if (!of_spinlock_lock(&spinlock)) OBJC_ERROR("Failed to lock spinlock!") #endif if (*object != nil && (old = objc_hashtable_get(hashtable, *object)) != NULL) { for (size_t i = 0; i < old->count; i++) { if (old->locations[i] == object) { if (--old->count == 0) { objc_hashtable_delete(hashtable, *object); free(old->locations); free(old); } else { id **locations; old->locations[i] = old->locations[old->count]; /* * We don't care if making it smaller * fails. */ if ((locations = realloc(old->locations, old->count * sizeof(id*))) != NULL) old->locations = locations; } break; } } } if (value != nil) { struct weak_ref *ref = objc_hashtable_get(hashtable, value); if (ref == NULL) { if ((ref = calloc(1, sizeof(*ref))) == NULL) OBJC_ERROR("Not enough memory to allocate weak " "reference!"); objc_hashtable_set(hashtable, value, ref); } if ((ref->locations = realloc(ref->locations, (ref->count + 1) * sizeof(id*))) == NULL) OBJC_ERROR("Not enough memory to allocate weak " "reference!") ref->locations[ref->count++] = object; } *object = value; #ifdef OF_HAVE_THREADS if (!of_spinlock_unlock(&spinlock)) OBJC_ERROR("Failed to unlock spinlock!") #endif return value; } id objc_loadWeakRetained(id *object) { id ret = nil; struct weak_ref *ref; #ifdef OF_HAVE_THREADS if (!of_spinlock_lock(&spinlock)) OBJC_ERROR("Failed to lock spinlock!") #endif if ((ref = objc_hashtable_get(hashtable, *object)) != NULL) ret = *object; #ifdef OF_HAVE_THREADS if (!of_spinlock_unlock(&spinlock)) OBJC_ERROR("Failed to unlock spinlock!") #endif return objc_retain(ret); } id objc_initWeak(id *object, id value) { *object = nil; return objc_storeWeak(object, value); } void objc_destroyWeak(id *object) { objc_storeWeak(object, nil); } id objc_loadWeak(id *object) { return objc_autorelease(objc_loadWeakRetained(object)); } void objc_copyWeak(id *dest, id *src) { objc_release(objc_initWeak(dest, objc_loadWeakRetained(src))); } void objc_moveWeak(id *dest, id *src) { struct weak_ref *ref; #ifdef OF_HAVE_THREADS if (!of_spinlock_lock(&spinlock)) OBJC_ERROR("Failed to lock spinlock!") #endif if ((ref = objc_hashtable_get(hashtable, *src)) != NULL) { for (size_t i = 0; i < ref->count; i++) { if (ref->locations[i] == src) { ref->locations[i] = dest; break; } } } *dest = *src; *src = nil; #ifdef OF_HAVE_THREADS if (!of_spinlock_unlock(&spinlock)) OBJC_ERROR("Failed to unlock spinlock!") #endif } void objc_zero_weak_references(id value) { struct weak_ref *ref; #ifdef OF_HAVE_THREADS if (!of_spinlock_lock(&spinlock)) OBJC_ERROR("Failed to lock spinlock!") #endif if ((ref = objc_hashtable_get(hashtable, value)) != NULL) { for (size_t i = 0; i < ref->count; i++) *ref->locations[i] = nil; objc_hashtable_delete(hashtable, value); free(ref->locations); free(ref); } #ifdef OF_HAVE_THREADS if (!of_spinlock_unlock(&spinlock)) OBJC_ERROR("Failed to unlock spinlock!") #endif } |
Modified src/runtime/runtime.h from [6046b12ca6] to [a4ce0a161a].
︙ | ︙ | |||
218 219 220 221 222 223 224 225 226 227 228 229 230 231 | extern objc_uncaught_exception_handler objc_setUncaughtExceptionHandler( objc_uncaught_exception_handler); extern void objc_setForwardHandler(IMP, IMP); extern id objc_autorelease(id); extern void* objc_autoreleasePoolPush(void); extern void objc_autoreleasePoolPop(void*); extern id _objc_rootAutorelease(id); /* Used by the compiler, but can be called manually. */ extern IMP objc_msg_lookup(id, SEL); extern IMP objc_msg_lookup_stret(id, SEL); extern IMP objc_msg_lookup_super(struct objc_super*, SEL); extern IMP objc_msg_lookup_super_stret(struct objc_super*, SEL); #ifdef __cplusplus } | > | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | extern objc_uncaught_exception_handler objc_setUncaughtExceptionHandler( objc_uncaught_exception_handler); extern void objc_setForwardHandler(IMP, IMP); extern id objc_autorelease(id); extern void* objc_autoreleasePoolPush(void); extern void objc_autoreleasePoolPop(void*); extern id _objc_rootAutorelease(id); extern void objc_zero_weak_references(id); /* Used by the compiler, but can be called manually. */ extern IMP objc_msg_lookup(id, SEL); extern IMP objc_msg_lookup_stret(id, SEL); extern IMP objc_msg_lookup_super(struct objc_super*, SEL); extern IMP objc_msg_lookup_super_stret(struct objc_super*, SEL); #ifdef __cplusplus } |
︙ | ︙ |