Decode the image in the operation level's queue instead of URLSession delegate q…

…ueue. Because URLSession delegate queue is a barrier queue and shared between different operations

Decode the image in the operation level's queue instead of URLSession delegate q…
…ueue. Because URLSession delegate queue is a barrier queue and shared between different operations
DreamPiggy
Commit aeb5194dc4cfc9bc63a1d7ba972aa2139357319b 1 parent a54d1d7a
Showing 1 changed file with 18 additions and 5 deletions
SDWebImage/SDWebImageDownloaderOperation.m
--- a/SDWebImage/SDWebImageDownloaderOperation.m
View file @aeb5194
+++ b/SDWebImage/SDWebImageDownloaderOperation.m
View file @aeb5194
@@ -38,7 +38,9 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
 @property (strong, nonatomic, readwrite, nullable) NSURLSessionTask *dataTask;
-@property (strong, nonatomic, nullable) dispatch_queue_t barrierQueue;
+@property (strong, nonatomic, nonnull) dispatch_queue_t barrierQueue;
+
+@property (strong, nonatomic, nonnull) dispatch_queue_t coderQueue;
 #if SD_UIKIT
 @property (assign, nonatomic) UIBackgroundTaskIdentifier backgroundTaskId;
@@ -70,6 +72,7 @@ typedef NSMutableDictionary<NSString *, id> SDCallbacksDictionary;
         _expectedSize = 0;
         _unownedSession = session;
         _barrierQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderOperationBarrierQueue", DISPATCH_QUEUE_CONCURRENT);
+        _coderQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderOperationCoderQueue", DISPATCH_QUEUE_SERIAL);
     }
     return self;
 }
@@ -316,7 +319,7 @@ didReceiveResponse:(NSURLResponse *)response
     if ((self.options & SDWebImageDownloaderProgressiveDownload) && self.expectedSize > 0) {
         // Get the image data
-        NSData *imageData = [self.imageData copy];
+        __block NSData *imageData = [self.imageData copy];
         // Get the total bytes downloaded
         const NSInteger totalSize = imageData.length;
         // Get the finish status
@@ -333,16 +336,18 @@ didReceiveResponse:(NSURLResponse *)response
             }
         }
+        dispatch_async(self.coderQueue, ^{
             UIImage *image = [self.progressiveCoder incrementallyDecodedImageWithData:imageData finished:finished];
             if (image) {
                 NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:self.request.URL];
                 image = [self scaledImageForKey:key image:image];
                 if (self.shouldDecompressImages) {
-                image = [[SDWebImageCodersManager sharedInstance] decompressedImageWithImage:image data:&data options:@{SDWebImageCoderScaleDownLargeImagesKey: @(NO)}];
+                    image = [[SDWebImageCodersManager sharedInstance] decompressedImageWithImage:image data:&imageData options:@{SDWebImageCoderScaleDownLargeImagesKey: @(NO)}];
                 }
                 [self callCompletionBlocksWithImage:image imageData:nil error:nil finished:NO];
             }
+        });
     }
     for (SDWebImageDownloaderProgressBlock progressBlock in [self callbacksForKey:kProgressCallbackKey]) {
@@ -380,14 +385,16 @@ didReceiveResponse:(NSURLResponse *)response
         });
     }
+    // make sure to call `[self done]` to mark operation as finished
     if (error) {
         [self callCompletionBlocksWithError:error];
+        [self done];
     } else {
         if ([self callbacksForKey:kCompletedCallbackKey].count > 0) {
             /**
              *  If you specified to use `NSURLCache`, then the response you get here is what you need.
              */
-            NSData *imageData = [self.imageData copy];
+            __block NSData *imageData = [self.imageData copy];
             if (imageData) {
                 /**  if you specified to only use cached data via `SDWebImageDownloaderIgnoreCachedResponse`,
                  *  then we should check if the cached data is equal to image data
@@ -395,7 +402,9 @@ didReceiveResponse:(NSURLResponse *)response
                 if (self.options & SDWebImageDownloaderIgnoreCachedResponse && [self.cachedData isEqualToData:imageData]) {
                     // call completion block with nil
                     [self callCompletionBlocksWithImage:nil imageData:nil error:nil finished:YES];
+                    [self done];
                 } else {
+                    dispatch_async(self.coderQueue, ^{
                         UIImage *image = [[SDWebImageCodersManager sharedInstance] decodedImageWithData:imageData];
                         NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:self.request.URL];
                         image = [self scaledImageForKey:key image:image];
@@ -425,13 +434,17 @@ didReceiveResponse:(NSURLResponse *)response
                         } else {
                             [self callCompletionBlocksWithImage:image imageData:imageData error:nil finished:YES];
                         }
+                        [self done];
+                    });
                 }
             } else {
                 [self callCompletionBlocksWithError:[NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Image data is nil"}]];
+                [self done];
             }
+        } else {
+            [self done];
         }
     }
-    [self done];
 }
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler {