Differences From Artifact [49b08c57ae]:
- File
src/OFBlock.m
— part of check-in
[6f4eb004a3]
at
2010-12-18 23:39:20
on branch trunk
— Add support for the new GNU runtime.
Currently, the properties test for nonatomic fails. This is a bug in
the new GNU runtime. (user: js, size: 9781) [annotate] [blame] [check-ins using]
To Artifact [60baf332a9]:
- File src/OFBlock.m — part of check-in [88c920bd62] at 2010-12-28 22:18:34 on branch trunk — Make ObjFW work again without threads and without atomic ops. (user: js, size: 11069) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | */ #include "config.h" #include <stdint.h> #include <stdlib.h> #include <string.h> #if defined(OF_APPLE_RUNTIME) && !defined(__OBJC2__) # import <objc/runtime.h> #endif #import "OFBlock.h" #import "OFExceptions.h" | > > > | > > > > | 10 11 12 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 | */ #include "config.h" #include <stdint.h> #include <stdlib.h> #include <string.h> #include <assert.h> #if defined(OF_APPLE_RUNTIME) && !defined(__OBJC2__) # import <objc/runtime.h> #endif #import "OFBlock.h" #import "OFExceptions.h" #ifdef OF_ATOMIC_OPS # import "atomic.h" #endif #ifdef OF_THREADS # import "threading.h" #endif @protocol RetainRelease - retain; - (void)release; @end #if defined(OF_OBJFW_RUNTIME) || defined(OF_GNU_RUNTIME) || \ |
︙ | ︙ | |||
131 132 133 134 135 136 137 138 139 140 141 142 143 144 | extern void *_NSConcreteMallocBlock; #endif static struct { Class isa; } alloc_failed_exception; void* _Block_copy(const void *block_) { of_block_literal_t *block = (of_block_literal_t*)block_; if (block->isa == (Class)&_NSConcreteStackBlock) { of_block_literal_t *copy; | > > > > > > | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | extern void *_NSConcreteMallocBlock; #endif static struct { Class isa; } alloc_failed_exception; #if !defined(OF_ATOMIC_OPS) && defined(OF_THREADS) # define NUM_SPINLOCKS 8 /* needs to be a power of 2 */ # define SPINLOCK_HASH(p) ((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1) static of_spinlock_t spinlocks[NUM_SPINLOCKS]; #endif void* _Block_copy(const void *block_) { of_block_literal_t *block = (of_block_literal_t*)block_; if (block->isa == (Class)&_NSConcreteStackBlock) { of_block_literal_t *copy; |
︙ | ︙ | |||
155 156 157 158 159 160 161 | if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE) block->descriptor->copy_helper(copy, block); return copy; } | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE) block->descriptor->copy_helper(copy, block); return copy; } if (block->isa == (Class)&_NSConcreteMallocBlock) { #if defined(OF_ATOMIC_OPS) of_atomic_inc_int(&block->flags); #else # ifdef OF_THREADS unsigned hash = SPINLOCK_HASH(block); assert(of_spinlock_lock(&spinlocks[hash])); # endif block->flags++; # ifdef OF_THREADS assert(of_spinlock_unlock(&spinlocks[hash])); # endif #endif } return block; } void _Block_release(const void *block_) { of_block_literal_t *block = (of_block_literal_t*)block_; if (block->isa != (Class)&_NSConcreteMallocBlock) return; #ifdef OF_ATOMIC_OPS if ((of_atomic_dec_int(&block->flags) & OF_BLOCK_REFCOUNT_MASK) == 0) { if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE) block->descriptor->dispose_helper(block); free(block); } #else # ifdef OF_THREADS unsigned hash = SPINLOCK_HASH(block); assert(of_spinlock_lock(&spinlocks[hash])); # endif if ((--block->flags & OF_BLOCK_REFCOUNT_MASK) == 0) { # ifdef OF_THREADS assert(of_spinlock_unlock(&spinlocks[hash])); # endif if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE) block->descriptor->dispose_helper(block); free(block); } # ifdef OF_THREADS assert(of_spinlock_unlock(&spinlocks[hash])); # endif #endif } void _Block_object_assign(void *dst_, const void *src_, const int flags_) { int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK | OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF); |
︙ | ︙ | |||
274 275 276 277 278 279 280 281 282 283 284 285 286 287 | if ((tmp = objc_allocateClassPair(self, "OFMallocBlock", 0)) == NULL) @throw [OFInitializationFailedException newWithClass: self]; memcpy(&_NSConcreteMallocBlock, tmp, sizeof(_NSConcreteMallocBlock)); free(tmp); objc_registerClassPair((Class)&_NSConcreteMallocBlock); } #endif + alloc { @throw [OFNotImplementedException newWithClass: self selector: _cmd]; } | > > > > > > > > > > > > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | if ((tmp = objc_allocateClassPair(self, "OFMallocBlock", 0)) == NULL) @throw [OFInitializationFailedException newWithClass: self]; memcpy(&_NSConcreteMallocBlock, tmp, sizeof(_NSConcreteMallocBlock)); free(tmp); objc_registerClassPair((Class)&_NSConcreteMallocBlock); } #endif #if !defined(OF_ATOMIC_OPS) && defined(OF_THREADS) + (void)initialize { size_t i; for (i = 0; i < NUM_SPINLOCKS; i++) if (!of_spinlock_new(&spinlocks[i])) @throw [OFInitializationFailedException newWithClass: self]; } #endif + alloc { @throw [OFNotImplementedException newWithClass: self selector: _cmd]; } |
︙ | ︙ |