fix preprocessor flags

fix deadlock in processMemoryWarning method
mikeash · Oct 21, 2010 · f9ecda2 · f9ecda2
1 parent 6fa5332
commit f9ecda2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/MAFuture.h b/MAFuture.h
@@ -6,8 +6,7 @@ id MALazyFuture(id (^block)(void));
 #define MALazyFuture(...) ((__typeof((__VA_ARGS__)()))MALazyFuture((id (^)(void))(__VA_ARGS__)))
 
 
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-#if (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
+#ifdef __IPHONE_4_0
 
 #pragma mark -
 
@@ -16,6 +15,7 @@ id IKMemoryAwareFutureCreate(id (^block)(void));
 void IKMemoryAwareFutureBeginContentAccess(id future);
 void IKMemoryAwareFutureEndContentAccess(id future);
 BOOL IKMemoryAwareFutureIsObserving(id future);
+void IKInvalidateMemoryAwareFuture(id future);
 
 #define IKMemoryAwareFuture(...)((__typeof((__VA_ARGS__)()))IKMemoryAwareFuture((id (^)(void))(__VA_ARGS__)))
 #define IKMemoryAwareFutureCreate(...)((__typeof((__VA_ARGS__)()))IKMemoryAwareFutureCreate((id (^)(void))(__VA_ARGS__)))
@@ -29,5 +29,4 @@ id IKAutoArchivingMemoryAwareFutureCreate(id (^block)(void));
 
 #define IKAutoArchivingMemoryAwareFutureCreate(...)((__typeof((__VA_ARGS__)()))IKAutoArchivingMemoryAwareFutureCreate((id (^)(void))(__VA_ARGS__)))
 
-#endif // (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED
+#endif // __IPHONE_4_0
diff --git a/MAFuture.m b/MAFuture.m
@@ -121,8 +121,7 @@ id MALazyFuture(id (^block)(void))
 #pragma mark -
 #pragma mark iOS Futures
 
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-#if (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
+#ifdef __IPHONE_4_0
 
 @implementation _IKMemoryAwareFuture
 @synthesize isObserving;
@@ -200,11 +199,8 @@ - (id)resolveFuture {
 - (void)processMemoryWarning {
     [_lock lock];
     [self setIsObservingUnlocked:NO];
-    NSThread *thread = [NSThread currentThread];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [self processMemoryWarningUnlocked];
-        [_lock performSelector:@selector(unlock) onThread:thread withObject:nil waitUntilDone:NO];
-    });
+    [self processMemoryWarningUnlocked];
+    [_lock unlock];
 }
 
 
@@ -238,6 +234,10 @@ BOOL IKMemoryAwareFutureIsObserving(id future) {
     return [future isObserving];
 }
 
+void IKInvalidateMemoryAwareFuture(id future) {
+    [future processMemoryWarning];
+}
+
 NSString* IKMemoryAwareFuturesDirectory() {
     static NSString* FuturesDirectory = nil;
     if (FuturesDirectory == nil) {
@@ -352,5 +352,4 @@ id IKAutoArchivingMemoryAwareFuture(id (^block)(void)) {
     return [IKAutoArchivingMemoryAwareFutureCreate(block) autorelease];
 }
 
-#endif // (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED
+#endif // __IPHONE_4_0
diff --git a/MAFutureInternal.h b/MAFutureInternal.h
@@ -15,8 +15,7 @@
 
 @end
 
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-#if (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
+#ifdef __IPHONE_4_0
 
 @interface _IKMemoryAwareFuture : _MALazyBlockFuture {
     BOOL isObserving;
@@ -72,5 +71,4 @@ NSString* IKMemoryAwareFuturePath(id future);
 
 @end
 
-#endif // (TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_3_2
-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED
+#endif // __IPHONE_4_0
diff --git a/MAMethodSignatureCache.h b/MAMethodSignatureCache.h
@@ -3,11 +3,11 @@
 
 @interface MAMethodSignatureCache : NSObject
 {
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+#ifdef __IPHONE_4_0
     CFMutableDictionaryRef _cache;
 #else
     NSMapTable *_cache;
-#endif
+#endif // __IPHONE_4_0
     NSRecursiveLock *_lock;
 }
 

diff --git a/MAMethodSignatureCache.m b/MAMethodSignatureCache.m
@@ -35,14 +35,14 @@ - (id)init
 {
     if((self = [super init]))
     {
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+#ifdef __IPHONE_4_0
         _cache = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL, &kCFTypeDictionaryValueCallBacks);
 #else
         _cache = [[NSMapTable alloc]
                   initWithKeyOptions: NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality
                   valueOptions: NSPointerFunctionsStrongMemory | NSPointerFunctionsObjectPersonality
                   capacity: 0];
-#endif
+#endif // __IPHONE_4_0
         _lock = [[NSRecursiveLock alloc] init];
         [[NSNotificationCenter defaultCenter]
          addObserver: self
@@ -56,11 +56,11 @@ - (id)init
 - (void)_clearCache
 {
     [_lock ma_do: ^{
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+#ifdef __IPHONE_4_0
         CFDictionaryRemoveAllValues(_cache);
 #else
         [_cache removeAllObjects]; 
-#endif
+#endif // __IPHONE_4_0
     }];
 }
 
@@ -105,21 +105,21 @@ - (NSMethodSignature *)cachedMethodSignatureForSelector: (SEL)sel
 {
     __block NSMethodSignature *sig = nil;
     [_lock ma_do: ^{
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+#ifdef __IPHONE_4_0
         sig = CFDictionaryGetValue(_cache, sel);
 #else
         sig = [_cache objectForKey: (id)sel];
-#endif
+#endif // __IPHONE_4_0
         if(!sig)
         {
             sig = [self _searchAllClassesForSignature: sel];
             if(!sig)
                 sig = (id)[NSNull null];
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+#ifdef __IPHONE_4_0
             CFDictionarySetValue(_cache, sel, sig);
 #else
             [_cache setObject: sig forKey: (id)sel];
-#endif
+#endif //__IPHONE_4_0
         }
     }];
     if(sig == (id)[NSNull null])