Bring back manual memory management <3

Author: Mallory Paine

FastImageCache/FICImageCache.h

@@ -34,7 +34,7 @@ typedef void (^FICImageRequestCompletionBlock)(UIImage *sourceImage);
  @discussion The delegate is responsible for asynchronously providing the source image for an entity. Optionally, the delegate can require that all formats in a format
  family for a particular entity be processed. Any errors that occur in the image cache are also communicated back to the delegate.
  */
-@property (nonatomic, weak) id <FICImageCacheDelegate> delegate;
+@property(nonatomic, assign) id <FICImageCacheDelegate> delegate;
 
 ///---------------------------------------
 /// @name Accessing the Shared Image Cache

FastImageCache/FICImageCache.m

@@ -25,7 +25,7 @@ @interface FICImageCache () {
     NSMutableDictionary *_formats;
     NSMutableDictionary *_imageTables;
     NSMutableDictionary *_requests;
-    __weak id <FICImageCacheDelegate> _delegate;
+    id <FICImageCacheDelegate> _delegate;
 
     BOOL _delegateImplementsShouldProcessAllFormatsInFamilyForEntity;
     BOOL _delegateImplementsErrorDidOccurWithMessage;
@@ -87,6 +87,14 @@ - (id)init {
     return self;
 }
 
+- (void)dealloc {
+    [_formats release];
+    [_imageTables release];
+    [_requests release];
+    
+    [super dealloc];
+}
+
 #pragma mark - Working with Formats
 
 - (void)setFormats:(NSArray *)formats {
@@ -102,6 +110,7 @@ - (void)setFormats:(NSArray *)formats {
                 // Only initialize an image table for this format if it is needed on the current device.
                 FICImageTable *imageTable = [[FICImageTable alloc] initWithFormat:imageFormat];
                 [_imageTables setObject:imageTable forKey:formatName];
+                [imageTable release];
                 [_formats setObject:imageFormat forKey:formatName];
 
                 [imageTableFiles addObject:[[imageTable tableFilePath] lastPathComponent]];
@@ -139,7 +148,7 @@ - (NSArray *)formatsWithFamily:(NSString *)family {
         }
     }
 
-    return [formats copy];
+    return [[formats copy] autorelease];
 }
 
 #pragma mark - Retrieving Images
@@ -170,6 +179,8 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
                     completionBlock(entity, formatName, image);
                 });
             }
+            
+            [image release];    // Already retained by the block
         });
     } else {
         UIImage *image = [imageTable newImageForEntityUUID:entityUUID sourceImageUUID:sourceImageUUID preheatData:NO];
@@ -185,6 +196,8 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
                     });
                 }
             }
+            
+            [image release];    // Already retained by the block
         };
 
         if (image == nil && _delegate != nil) {
@@ -262,7 +275,7 @@ static void _FICAddCompletionBlockForEntity(NSString *formatName, NSMutableDicti
             [completionBlocks setObject:blocksArray forKey:formatName];
         }
 
-        FICImageCacheCompletionBlock completionBlockCopy = [completionBlock copy];
+        FICImageCacheCompletionBlock completionBlockCopy = [[completionBlock copy] autorelease];
         [blocksArray addObject:completionBlockCopy];
     }
 }
@@ -274,7 +287,7 @@ - (void)setImage:(UIImage *)image forEntity:(id <FICEntity>)entity withFormatNam
         NSDictionary *completionBlocksDictionary = nil;
 
         if (completionBlock != nil) {
-            completionBlocksDictionary = [NSDictionary dictionaryWithObject:[NSArray arrayWithObject:[completionBlock copy]] forKey:formatName];
+            completionBlocksDictionary = [NSDictionary dictionaryWithObject:[NSArray arrayWithObject:[[completionBlock copy] autorelease]] forKey:formatName];
         }
 
         NSString *entityUUID = [entity UUID];
@@ -348,6 +361,8 @@ - (void)_processImage:(UIImage *)image forEntity:(id <FICEntity>)entity imageTab
                     }
                 });
             }
+            
+            [resultImage release];
         });
     }
 }

FastImageCache/FICImageFormat.m

@@ -127,7 +127,7 @@ - (BOOL)isGrayscale {
 #pragma mark - Object Lifecycle
 
 + (instancetype)formatWithName:(NSString *)name family:(NSString *)family imageSize:(CGSize)imageSize style:(FICImageFormatStyle)style maximumCount:(NSInteger)maximumCount devices:(FICImageFormatDevices)devices {
-    FICImageFormat *imageFormat = [[FICImageFormat alloc] init];
+    FICImageFormat *imageFormat = [[[FICImageFormat alloc] init] autorelease];
 
     [imageFormat setName:name];
     [imageFormat setFamily:family];
@@ -139,6 +139,13 @@ + (instancetype)formatWithName:(NSString *)name family:(NSString *)family imageS
     return imageFormat;
 }
 
+- (void)dealloc {
+    [_name release];
+    [_family release];
+    
+    [super dealloc];
+}
+
 #pragma mark - Working with Dictionary Representations
 
 - (NSDictionary *)dictionaryRepresentation {

FastImageCache/FICImageTable.h

@@ -42,7 +42,7 @@ extern NSString *const FICImageTableScreenScaleKey;
 /**
  The image format that describes the image table.
  */
-@property (nonatomic, strong, readonly) FICImageFormat *imageFormat;
+@property (nonatomic, retain, readonly) FICImageFormat *imageFormat;
 
 ///-----------------------------------------------
 /// @name Accessing Information about Image Tables

FastImageCache/FICImageTable.m

@@ -52,7 +52,7 @@ @interface FICImageTable () {
 
     NSMutableDictionary *_chunkDictionary;
     NSCountedSet *_chunkSet;
-    
+
     NSRecursiveLock *_lock;
     CFMutableDictionaryRef _indexNumbers;
 
@@ -108,9 +108,9 @@ + (NSString *)directoryPath {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-        __directoryPath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"ImageTables"];
+        __directoryPath = [[[paths objectAtIndex:0] stringByAppendingPathComponent:@"ImageTables"] retain];
 
-        NSFileManager *fileManager = [[NSFileManager alloc] init];
+        NSFileManager *fileManager = [[[NSFileManager alloc] init] autorelease];
         BOOL directoryExists = [fileManager fileExistsAtPath:__directoryPath];
         if (directoryExists == NO) {
             [fileManager createDirectoryAtPath:__directoryPath withIntermediateDirectories:YES attributes:nil error:nil];
@@ -134,7 +134,7 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
         _indexNumbers = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL, &kCFTypeDictionaryValueCallBacks);
 
         _imageFormat = [imageFormat copy];
-        _imageFormatDictionary = [imageFormat dictionaryRepresentation];
+        _imageFormatDictionary = [[imageFormat dictionaryRepresentation] retain];
 
         _screenScale = [[UIScreen mainScreen] scale];
 
@@ -145,12 +145,12 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
 
         _chunkDictionary = [[NSMutableDictionary alloc] init];
         _chunkSet = [[NSCountedSet alloc] init];
-        
+
         _indexMap = [[NSMutableDictionary alloc] init];
         _occupiedIndexes = [[NSMutableIndexSet alloc] init];
 
         _MRUEntries = [[NSMutableOrderedSet alloc] init];
-        _inUseEntries = [NSCountedSet set];
+        _inUseEntries = [[NSCountedSet alloc] init];
 
         _sourceImageMap = [[NSMutableDictionary alloc] init];
 
@@ -188,7 +188,8 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
             // If something goes wrong and we can't open the image table file, then we have no choice but to release and nil self.
             NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s could not open the image table file at path %@. The image table was not created.", __PRETTY_FUNCTION__, _filePath];
             [[FICImageCache sharedImageCache] _logMessage:message];
-
+            
+            [self release];
             self = nil;
         }    
     }
@@ -201,9 +202,24 @@ - (instancetype)init {
 }
 
 - (void)dealloc {
+    [_imageFormat release];
+    [_filePath release];
+    
+    [_indexMap release];
+    [_occupiedIndexes release];
+    [_MRUEntries release];
+    [_sourceImageMap release];
+    [_imageFormatDictionary release];
+    [_chunkDictionary release];
+    [_chunkSet release];
+    
     if (_fileDescriptor >= 0) {
         close(_fileDescriptor);
     }
+    
+    [_lock release];
+    
+    [super dealloc];
 }
 
 #pragma mark - Working with Chunks
@@ -225,7 +241,7 @@ - (FICImageTableChunk *)_chunkAtIndex:(NSInteger)index {
     FICImageTableChunk *chunk = nil;
 
     if (index < _chunkCount) {
-        chunk = [self _cachedChunkAtIndex:index];
+        chunk = [[self _cachedChunkAtIndex:index] retain];
 
         if (chunk == nil) {
             size_t chunkLength = _chunkLength;
@@ -234,7 +250,7 @@ - (FICImageTableChunk *)_chunkAtIndex:(NSInteger)index {
                 chunkLength = (size_t)(_fileLength - chunkOffset);
             }
 
-            chunk = [[FICImageTableChunk alloc] initWithFileDescriptor:_fileDescriptor index:index length:chunkLength];
+            chunk = [[FICImageTableChunk alloc] initWithImageTable:self fileDescriptor:_fileDescriptor index:index length:chunkLength];
             [self _setChunk:chunk index:index];
         }
     }
@@ -244,7 +260,15 @@ - (FICImageTableChunk *)_chunkAtIndex:(NSInteger)index {
         [[FICImageCache sharedImageCache] _logMessage:message];
     }
 
-    return chunk;
+    return [chunk autorelease];
+}
+
+- (void)_chunkWillBeDeallocated:(FICImageTableChunk *)chunk {
+    [_lock lock];
+    
+    [self _setChunk:nil index:[chunk index]];
+    
+    [_lock unlock];
 }
 
 #pragma mark - Storing, Retrieving, and Deleting Entries
@@ -291,8 +315,6 @@ - (void)setEntryForEntityUUID:(NSString *)entityUUID sourceImageUUID:(NSString *
                 [_lock unlock];
 
                 CGContextRef context = CGBitmapContextCreate([entryData bytes], pixelSize.width, pixelSize.height, bitsPerComponent, _imageRowLength, colorSpace, bitmapInfo);
-                CGColorSpaceRelease(colorSpace);
-                
                 CGContextTranslateCTM(context, 0, pixelSize.height);
                 CGContextScaleCTM(context, _screenScale, -_screenScale);
 
@@ -307,6 +329,7 @@ - (void)setEntryForEntityUUID:(NSString *)entityUUID sourceImageUUID:(NSString *
             } else {
                 [_lock unlock];
             }
+            CGColorSpaceRelease(colorSpace);
         } else {
             [_lock unlock];
         }
@@ -334,13 +357,15 @@ - (UIImage *)newImageForEntityUUID:(NSString *)entityUUID sourceImageUUID:(NSStr
                 } else {
                     [self _entryWasAccessedWithEntityUUID:entityUUID];
 
+                    [entryData retain]; // Released by _FICReleaseImageData
+                    
                     // Create CGImageRef whose backing store *is* the mapped image table entry. We avoid a memcpy this way.
-                    CGDataProviderRef dataProvider = CGDataProviderCreateWithData((__bridge_retained void *)entryData, [entryData bytes], [entryData imageLength], _FICReleaseImageData);
+                    CGDataProviderRef dataProvider = CGDataProviderCreateWithData((void *)entryData, [entryData bytes], [entryData imageLength], _FICReleaseImageData);
 
                     [_inUseEntries addObject:entityUUID];
-                    __weak FICImageTable *weakSelf = self;
+
                     [entryData executeBlockOnDealloc:^{
-                        [weakSelf removeInUseForEntityUUID:entityUUID];
+                        [self removeInUseForEntityUUID:entityUUID];
                     }];
 
                     CGSize pixelSize = [_imageFormat pixelSize];
@@ -442,7 +467,7 @@ - (int)_maximumCount {
 }
 
 - (void)_setEntryCount:(NSInteger)entryCount {
-    if (entryCount != _entryCount) {        
+    if (entryCount != _entryCount && _entriesPerChunk > 0) {
         off_t fileLength = entryCount * _entryLength;
         int result = ftruncate(_fileDescriptor, fileLength);
 
@@ -452,7 +477,7 @@ - (void)_setEntryCount:(NSInteger)entryCount {
         } else {
             _fileLength = fileLength;
             _entryCount = entryCount;
-            _chunkCount = _entriesPerChunk > 0 ? ((_entryCount + _entriesPerChunk - 1) / _entriesPerChunk) : 0;
+            _chunkCount = (_entryCount + _entriesPerChunk - 1) / _entriesPerChunk;
         }
     }
 }
@@ -477,9 +502,8 @@ - (FICImageTableEntry *)_entryDataAtIndex:(NSInteger)index {
 
             [_chunkSet addObject:chunk];
 
-            __weak FICImageTable *weakSelf = self;
             [entryData executeBlockOnDealloc:^{
-                [weakSelf _entryWasDeallocatedFromChunk:chunk];
+                [self _entryWasDeallocatedFromChunk:chunk];
             }];
         }
     }
@@ -491,7 +515,7 @@ - (FICImageTableEntry *)_entryDataAtIndex:(NSInteger)index {
         [[FICImageCache sharedImageCache] _logMessage:message];
     }
 
-    return entryData;
+    return [entryData autorelease];
 }
 
 - (void)_entryWasDeallocatedFromChunk:(FICImageTableChunk *)chunk {
@@ -511,6 +535,7 @@ - (NSInteger)_nextEntryIndex {
     if (index == NSNotFound) {
         index = _entryCount;
     }
+    [unoccupiedIndexes release];
 
     if (index >= [self _maximumCount] && [_MRUEntries count]) {
         // Evict the oldest/least-recently accessed entry here
@@ -576,8 +601,10 @@ - (void)_entryWasAccessedWithEntityUUID:(NSString *)entityUUID {
     if (index == NSNotFound) {
         [_MRUEntries insertObject:entityUUID atIndex:0];
     } else if (index != 0) {
+        [entityUUID retain];
         [_MRUEntries removeObjectAtIndex:index];
         [_MRUEntries insertObject:entityUUID atIndex:0];
+        [entityUUID release];
     }
 }
 
@@ -602,6 +629,7 @@ - (void)saveMetadata {
         if (!entryDict) {
             entryDict = [[NSMutableDictionary alloc] init];
             [entryMetadata setObject:entryDict forKey:entityUUID];
+            [entryDict release];
         }
         NSNumber *tableIndexVal = [_indexMap objectForKey:entityUUID];
         NSString *contextUUID = [_sourceImageMap objectForKey:entityUUID];
@@ -616,7 +644,7 @@ - (void)saveMetadata {
 
     NSDictionary *metadataDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
                                         entryMetadata, FICImageTableMetadataKey,
-                                        [_imageFormatDictionary copy], FICImageTableFormatKey, nil];
+                                        [[_imageFormatDictionary copy] autorelease], FICImageTableFormatKey, nil];
 
     [_lock unlock];
 

FastImageCache/FICImageTableChunk.h

@@ -42,6 +42,8 @@
 
 /**
  Initializes a new image table chunk.
+ 
+ @param imageTable The image table to create a chunk from.
 
  @param fileDescriptor The image table's file descriptor to map from.
  
@@ -51,6 +53,6 @@
  
  @return A new image table chunk.
  */
-- (instancetype)initWithFileDescriptor:(int)fileDescriptor index:(NSInteger)index length:(size_t)length;
+- (instancetype)initWithImageTable:(FICImageTable *)imageTable fileDescriptor:(int)fileDescriptor index:(NSInteger)index length:(size_t)length;
 
 @end