mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use GCD barrier for reading

This commit is contained in:
Olivier Poitrey 2012-12-10 15:08:56 +01:00
parent 43e94e7380
commit 21ff7bd6ff
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
SDWebImage/SDWebImageDownloader.m
View File

@ -107,7 +107,7 @@ static NSString *const kCompletedCallbackKey = @"completed";
{ {
if (!wself) return; if (!wself) return;
SDWebImageDownloader *sself = wself; SDWebImageDownloader *sself = wself;
NSArray *callbacksForURL = [sself callbacksForURL:url remove:NO]; NSArray *callbacksForURL = [sself callbacksForURL:url];
for (NSDictionary *callbacks in callbacksForURL) for (NSDictionary *callbacks in callbacksForURL)
{ {
SDWebImageDownloaderProgressBlock callback = callbacks[kProgressCallbackKey]; SDWebImageDownloaderProgressBlock callback = callbacks[kProgressCallbackKey];
@ -118,7 +118,11 @@ static NSString *const kCompletedCallbackKey = @"completed";
{ {
if (!wself) return; if (!wself) return;
SDWebImageDownloader *sself = wself; SDWebImageDownloader *sself = wself;
NSArray *callbacksForURL = [sself callbacksForURL:url remove:finished]; NSArray *callbacksForURL = [sself callbacksForURL:url];
if (finished)
{
[sself removeCallbacksForURL:url];
}
for (NSDictionary *callbacks in callbacksForURL) for (NSDictionary *callbacks in callbacksForURL)
{ {
SDWebImageDownloaderCompletedBlock callback = callbacks[kCompletedCallbackKey]; SDWebImageDownloaderCompletedBlock callback = callbacks[kCompletedCallbackKey];
@ -129,7 +133,8 @@ static NSString *const kCompletedCallbackKey = @"completed";
{ {
if (!wself) return; if (!wself) return;
SDWebImageDownloader *sself = wself; SDWebImageDownloader *sself = wself;
[sself callbacksForURL:url remove:YES]; [sself callbacksForURL:url];
[sself removeCallbacksForURL:url];
}]; }];
[self.downloadQueue addOperation:operation]; [self.downloadQueue addOperation:operation];
}]; }];
@ -163,25 +168,22 @@ static NSString *const kCompletedCallbackKey = @"completed";
}); });
} }
- (NSArray *)callbacksForURL:(NSURL *)url remove:(BOOL)remove - (NSArray *)callbacksForURL:(NSURL *)url
{ {
__block NSArray *callbacksForURL; __block NSArray *callbacksForURL;
if (remove) dispatch_sync(self.barrierQueue, ^
{ {
dispatch_barrier_sync(self.barrierQueue, ^ callbacksForURL = self.URLCallbacks[url];
{ });
callbacksForURL = self.URLCallbacks[url];
[self.URLCallbacks removeObjectForKey:url];
});
}
else
{
dispatch_sync(self.barrierQueue, ^
{
callbacksForURL = self.URLCallbacks[url];
});
}
return callbacksForURL; return callbacksForURL;
} }
- (void)removeCallbacksForURL:(NSURL *)url
{
dispatch_barrier_async(self.barrierQueue, ^
{
[self.URLCallbacks removeObjectForKey:url];
});
}
@end @end