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

Using the same synchornized to guard _cancelled status, which need recursive lock 

DO NOT USE SD_LOCK (os_unfair_lock), which not support recursive
This commit is contained in:
DreamPiggy 2022-09-19 17:33:04 +08:00
parent ad592765cb
commit 6b8075a2e1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDWebImage/Core/SDWebImageManager.h
View File

@ -29,6 +29,9 @@ typedef void(^SDInternalCompletionBlock)(UIImage * _Nullable image, NSData * _Nu
*/ */
- (void)cancel; - (void)cancel;
/// Whether the operation has been cancelled.
@property (nonatomic, assign, readonly, getter=isCancelled) BOOL cancelled;
/** /**
The cache operation from the image cache query The cache operation from the image cache query
*/ */

12
SDWebImage/Core/SDWebImageManager.m
View File

@ -803,12 +803,20 @@ static id<SDImageLoader> _defaultImageLoader;
@implementation SDWebImageCombinedOperation @implementation SDWebImageCombinedOperation
- (BOOL)isCancelled {
// Need recursive lock (user's cancel block may check isCancelled), do not use SD_LOCK
@synchronized (self) {
return _cancelled;
}
}
- (void)cancel { - (void)cancel {
// Need recursive lock (user's cancel block may check isCancelled), do not use SD_LOCK
@synchronized(self) { @synchronized(self) {
if (self.isCancelled) { if (_cancelled) {
return; return;
} }
self.cancelled = YES; _cancelled = YES;
if (self.cacheOperation) { if (self.cacheOperation) {
[self.cacheOperation cancel]; [self.cacheOperation cancel];
self.cacheOperation = nil; self.cacheOperation = nil;