Merge pull request SDWebImage#1221 from harishkashyap/master

bpoplauschi · bpoplauschi · commit c8c00810dd6c · 2015-10-25T19:37:13.000+02:00
diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m
@@ -301,7 +301,11 @@ - (void)cancelAll {
 }
 
 - (BOOL)isRunning {
-    return self.runningOperations.count > 0;
+    BOOL isRunning = NO;
+    @synchronized(self.runningOperations) {
+        isRunning = (self.runningOperations.count > 0);
+    }
+    return isRunning;
 }
 
 @end
diff --git a/SDWebImage/SDWebImagePrefetcher.m b/SDWebImage/SDWebImagePrefetcher.m
@@ -78,12 +78,7 @@ - (void)startPrefetchingAtIndex:(NSUInteger)index {
                             didPrefetchURL:self.prefetchURLs[index]
                              finishedCount:self.finishedCount
                                 totalCount:self.prefetchURLs.count
-            ];
-        }
-        if (self.prefetchURLs.count > self.requestedCount) {
-            dispatch_async(self.prefetcherQueue, ^{
-                [self startPrefetchingAtIndex:self.requestedCount];
-            });
+             ];
         }
         else if (self.finishedCount == self.requestedCount) {
             [self reportStatus];
@@ -102,7 +97,7 @@ - (void)reportStatus {
         [self.delegate imagePrefetcher:self
                didFinishWithTotalCount:(total - self.skippedCount)
                           skippedCount:self.skippedCount
-        ];
+         ];
     }
 }
 
@@ -117,14 +112,29 @@ - (void)prefetchURLs:(NSArray *)urls progress:(SDWebImagePrefetcherProgressBlock
     self.completionBlock = completionBlock;
     self.progressBlock = progressBlock;
 
-    if(urls.count == 0){ 
-        if(completionBlock){
+    __weak SDWebImagePrefetcher *weakSelf = self;
+
+    if (urls.count == 0) {
+        if (completionBlock) {
             completionBlock(0,0);
         }
-    }else{
-        // Starts prefetching from the very first image on the list with the max allowed concurrency
-        NSUInteger listCount = self.prefetchURLs.count;
-        for (NSUInteger i = 0; i < self.maxConcurrentDownloads && self.requestedCount < listCount; i++) {
+    } else {
+        // http://oleb.net/blog/2013/07/parallelize-for-loops-gcd-dispatch_apply/
+        // Optimize the maxConcurrentdownloads for effeciency. Since caching operations are involved that are non-trivial using
+        // dispatch_apply might be helpful.
+
+        NSInteger maxNumberOfImages = self.prefetchURLs.count;
+
+        dispatch_apply(maxNumberOfImages/self.maxConcurrentDownloads, dispatch_get_global_queue(self.prefetcherQueue, 0), ^(size_t index) {
+            size_t i = index * self.maxConcurrentDownloads;
+            size_t stop = i + self.maxConcurrentDownloads;
+            do {
+                [weakSelf startPrefetchingAtIndex:i++];
+            } while (i < stop);
+        });
+
+        // Download remaining images.
+        for (size_t i = maxNumberOfImages - (maxNumberOfImages % self.maxConcurrentDownloads); i < (size_t)maxNumberOfImages; i++) {
             [self startPrefetchingAtIndex:i];
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,11 @@ - (void)cancelAll {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`- (BOOL)isRunning {`
`304`		`- return self.runningOperations.count > 0;`
	`304`	`+ BOOL isRunning = NO;`
	`305`	`+ @synchronized(self.runningOperations) {`
	`306`	`+ isRunning = (self.runningOperations.count > 0);`
	`307`	`+ }`
	`308`	`+ return isRunning;`
`305`	`309`	`}`
`306`	`310`
`307`	`311`	`@end`