revert to original version of MAFuture library and use no-arc setting…

… during compile for those files
Pixate · Mar 25, 2014 · 47a5faf · 47a5faf
1 parent 50e575d
commit 47a5faf
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 98 deletions.
diff --git a/src/Kernel/Third-Party/MAFuture/MABaseFuture.m b/src/Kernel/Third-Party/MAFuture/MABaseFuture.m
@@ -11,6 +11,14 @@ - (id)init
     return self;
 }
 
+- (void)dealloc
+{
+    [_value release];
+    [_lock release];
+
+    [super dealloc];
+}
+
 - (void)setFutureValue: (id)value
 {
     [_lock lock];
@@ -32,6 +40,8 @@ - (id)futureValue
 
 - (void)setFutureValueUnlocked: (id)value
 {
+    [value retain];
+    [_value release];
     _value = value;
     _resolved = YES;
     [_lock broadcast];

diff --git a/src/Kernel/Third-Party/MAFuture/MACompoundFuture.m b/src/Kernel/Third-Party/MAFuture/MACompoundFuture.m
@@ -99,7 +99,7 @@ - (void)forwardInvocation: (NSInvocation *)invocation
             if(type[0] == '^' && type[1] == '@')
             {
                 // get the existing pointer-to-object
-                void **parameterValue;
+                id *parameterValue;
                 [invocation getArgument: &parameterValue atIndex: i];
 
                 // if it's NULL, then we don't need to do anything
@@ -109,7 +109,7 @@ - (void)forwardInvocation: (NSInvocation *)invocation
 
                     // allocate space to receive the final computed value
                     NSMutableData *newParameterSpace = [NSMutableData dataWithLength: sizeof(id)];
-                    void **newParameterValue = [newParameterSpace mutableBytes];
+                    id *newParameterValue = [newParameterSpace mutableBytes];
 
                     // set the parameter to point to the new space
                     [invocation setArgument: &newParameterValue atIndex: i];
@@ -127,6 +127,7 @@ - (void)forwardInvocation: (NSInvocation *)invocation
                             [parameterDatas self];
                             return (id)nil;
                         }];
+                        [invocationFuture autorelease];
                     }
                     [parameterDatas addObject: newParameterSpace];
 
@@ -136,11 +137,14 @@ - (void)forwardInvocation: (NSInvocation *)invocation
                         // capture the NSMutableData to ensure that it stays live
                         // interior pointer problem
                         [newParameterSpace self];
-                        return (__bridge id) *newParameterValue;
+                        return *newParameterValue;
                     }];
 
                     // and now "return" it
-                    *parameterValue = (__bridge void *)(parameterFuture);
+                    *parameterValue = parameterFuture;
+
+                    // memory management
+                    [parameterFuture autorelease];
                 }
             }
         }
@@ -157,6 +161,7 @@ - (void)forwardInvocation: (NSInvocation *)invocation
         }];
         LOG(@"forwardInvocation: %p creating new compound future %p", invocation, returnFuture);
         [invocation setReturnValue: &returnFuture];
+        [returnFuture release];
     }
 }
 
@@ -171,13 +176,13 @@ id MACompoundBackgroundFuture(id (^block)(void))
         return [blockFuture resolveFuture];
     }];
 
-    return compoundFuture;
+    return [compoundFuture autorelease];
 }
 
 #undef MACompoundLazyFuture
 id MACompoundLazyFuture(id (^block)(void))
 {
     _MACompoundFuture *compoundFuture = [[_MACompoundFuture alloc] initWithBlock: block];
 
-    return compoundFuture;
+    return [compoundFuture autorelease];
 }
diff --git a/src/Kernel/Third-Party/MAFuture/MAFuture.m b/src/Kernel/Third-Party/MAFuture/MAFuture.m
@@ -1,6 +1,5 @@
 #import <dispatch/dispatch.h>
 #import <Foundation/Foundation.h>
-#import <objc/runtime.h>
 
 #import "MABaseFuture.h"
 #import "MAFuture.h"
@@ -24,7 +23,7 @@ - (id)forwardingTargetForSelector: (SEL)sel
 #if ENABLE_LOGGING
     id resolvedFuture = [self resolveFuture];
     if (resolvedFuture == nil) {
-        LOG(@"WARNING: [%@ resolveFuture] has returned nil. You must avoid to return nil objects from the block", [self class]);
+        LOG(@"WARNING: [%@ resolveFuture] has returned nil. You must avoid to return nil objects from the block", NSStringFromClass(isa));
     }
     return resolvedFuture;
 #else
@@ -86,12 +85,19 @@ - (id)initWithBlock: (id (^)(void))block
     return self;
 }
 
+- (void)dealloc
+{
+    [_block release];
+    [super dealloc];
+}
+
 - (id)resolveFuture
 {
     [_lock lock];
     if(![self futureHasResolved])
     {
         [self setFutureValueUnlocked: _block()];
+        [_block release];
         _block = nil;
     }
     [_lock unlock];
@@ -103,13 +109,13 @@ - (id)resolveFuture
 #undef MABackgroundFuture
 id MABackgroundFuture(id (^block)(void))
 {
-    return [[_MABackgroundBlockFuture alloc] initWithBlock: block];
+    return [[[_MABackgroundBlockFuture alloc] initWithBlock: block] autorelease];
 }
 
 #undef MALazyFuture
 id MALazyFuture(id (^block)(void))
 {
-    return [[_MALazyBlockFuture alloc] initWithBlock: block];
+    return [[[_MALazyBlockFuture alloc] initWithBlock: block] autorelease];
 }
 
 #pragma mark -
@@ -153,7 +159,7 @@ - (void)setCountOfUsers:(NSInteger)newCountOfUsers {
 
 
 - (id)futureValue {
-    return [super futureValue];
+    return [[[super futureValue] retain] autorelease];
 }
 
 
@@ -174,6 +180,7 @@ - (void)setIsObservingUnlocked:(BOOL)newIsObserving {
 
 - (void)dealloc {
     [self setIsObservingUnlocked:NO];
+    [super dealloc];
 }
 
 
@@ -202,7 +209,7 @@ - (void)processMemoryWarning {
 - (void)processMemoryWarningUnlocked {
     // TODO: must be checked when resolvation algorithm is changed.
     _resolved = NO;
-    _value = nil;
+    [_value release], _value = nil;
 }
 
 
@@ -217,7 +224,7 @@ - (void)invalidateUnlocked {
     // TODO: must be checked when resolvation algorithm is changed.
     [self setIsObservingUnlocked:NO];
     _resolved = NO;
-    _value = nil;
+    [_value release], _value = nil;
 }
 
 @end
@@ -229,7 +236,7 @@ id IKMemoryAwareFutureCreate(id (^block)(void)) {
 
 #undef IKMemoryAwareFuture
 id IKMemoryAwareFuture(id (^block)(void)) {
-    return IKMemoryAwareFutureCreate(block);
+    return [IKMemoryAwareFutureCreate(block) autorelease];
 }
 
 void IKMemoryAwareFutureBeginContentAccess(id future) {
@@ -251,8 +258,8 @@ void IKInvalidateMemoryAwareFuture(id future) {
 NSString* IKMemoryAwareFuturesDirectory() {
     static NSString* FuturesDirectory = nil;
     if (FuturesDirectory == nil) {
-        FuturesDirectory = [NSTemporaryDirectory() stringByAppendingPathComponent:@"futures"];
-    };
+        FuturesDirectory = [[NSTemporaryDirectory() stringByAppendingPathComponent:@"futures"] retain];
+    }
     return FuturesDirectory;
 }
 
@@ -294,6 +301,7 @@ - (void)dealloc {
 #else
     [[NSFileManager defaultManager] removeItemAtPath:IKMemoryAwareFuturePath(self) error:NULL];
 #endif
+    [super dealloc];
 }
 
 
@@ -336,7 +344,7 @@ - (BOOL)archiveValueUnlocked {
 
 
 - (BOOL)unarchiveValueUnlocked {
-    id value = [NSKeyedUnarchiver unarchiveObjectWithFile:IKMemoryAwareFuturePath(self)];
+    id value = [[NSKeyedUnarchiver unarchiveObjectWithFile:IKMemoryAwareFuturePath(self)] retain];
     if (value != nil) {
         [self setFutureValueUnlocked:value];
     }
@@ -364,7 +372,7 @@ id IKAutoArchivingMemoryAwareFutureCreate(id (^block)(void)) {
 
 #undef IKAutoArchivingMemoryAwareFuture
 id IKAutoArchivingMemoryAwareFuture(id (^block)(void)) {
-    return IKAutoArchivingMemoryAwareFutureCreate(block);
+    return [IKAutoArchivingMemoryAwareFutureCreate(block) autorelease];
 }
 
 #endif // __IPHONE_4_0

diff --git a/src/Kernel/Third-Party/MAFuture/MAMethodSignatureCache.m b/src/Kernel/Third-Party/MAFuture/MAMethodSignatureCache.m
@@ -67,7 +67,7 @@ - (void)_clearCache
 - (NSMethodSignature *)_searchAllClassesForSignature: (SEL)sel
 {
     int count = objc_getClassList(NULL, 0);
-    Class *classes = (Class *)malloc(sizeof(*classes) * count);
+    Class *classes = malloc(sizeof(*classes) * count);
     objc_getClassList(classes, count);
 
     NSMethodSignature *sig = nil;
@@ -116,7 +116,7 @@ - (NSMethodSignature *)cachedMethodSignatureForSelector: (SEL)sel
             if(!sig)
                 sig = (id)[NSNull null];
 #ifdef __IPHONE_4_0
-            CFDictionarySetValue(_cache, sel, (__bridge const void *)(sig));
+            CFDictionarySetValue(_cache, sel, sig);
 #else
             [_cache setObject: sig forKey: (id)sel];
 #endif //__IPHONE_4_0

diff --git a/src/Kernel/Third-Party/MAFuture/MAProxy.h b/src/Kernel/Third-Party/MAFuture/MAProxy.h
@@ -1,6 +1,17 @@
-@interface MAProxy : NSObject 
+@interface MAProxy : NSObject
+{
+    int32_t _refcountMinusOne;
+}
 
+//+ (id)alloc;
+//- (void)dealloc;
+
+- (void)finalize;
 - (BOOL)isProxy;
+- (id)retain;
+- (void)release;
+- (id)autorelease;
+- (NSUInteger)retainCount;
 
 @end
 
diff --git a/src/Kernel/Third-Party/MAFuture/MAProxy.m b/src/Kernel/Third-Party/MAFuture/MAProxy.m
@@ -11,10 +11,46 @@ + (void)initialize
     // runtime requires an implementation
 }
 
+//+ (id)alloc
+//{
+//    return NSAllocateObject(self, 0, NULL);
+//}
+//
+//- (void)dealloc
+//{
+//    NSDeallocateObject(self);
+//}
+
+- (void)finalize
+{
+}
+
 - (BOOL)isProxy
 {
     return YES;
 }
 
+- (id)retain
+{
+    OSAtomicIncrement32(&_refcountMinusOne);
+    return self;
+}
+
+- (void)release
+{
+    if(OSAtomicDecrement32(&_refcountMinusOne) == -1)
+        [self dealloc];
+}
+
+- (id)autorelease
+{
+    [NSAutoreleasePool addObject: self];
+    return self;
+}
+
+- (NSUInteger)retainCount
+{
+    return _refcountMinusOne + 1;
+}
 
 @end