ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASDeallocQueue] Fix teardown of thread (doesn't currently happen due to singleton). (#2410)

Browse Source 
Although this didn't occur _currently_, the code was incorrect and needs to be fixed.
This commit is contained in:
appleguy
2016-10-18 09:07:29 -07:00
committed by Adlai Holler
parent d407663e3f
commit dec9e4e836
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AsyncDisplayKit/ASRunLoopQueue.mm
View File

@@ -79,7 +79,7 @@ static void runLoopSourceCallback(void *info) {
[_condition lock]; [_condition lock];
[_condition signal]; [_condition signal];
// At this moment, the thread is guaranteed to be finished starting. // At this moment, -init is signalled that the thread is guaranteed to be finished starting.
[_condition unlock]; [_condition unlock];
// Keep processing events until the runloop is stopped. // Keep processing events until the runloop is stopped.
@@ -87,6 +87,12 @@ static void runLoopSourceCallback(void *info) {
CFRunLoopTimerInvalidate(timer); CFRunLoopTimerInvalidate(timer);
CFRunLoopRemoveTimer(runloop, timer, kCFRunLoopCommonModes); CFRunLoopRemoveTimer(runloop, timer, kCFRunLoopCommonModes);
CFRelease(timer);
[_condition lock];
[_condition signal];
// At this moment, -stop is signalled that the thread is guaranteed to be finished exiting.
[_condition unlock];
} }
} }
@@ -116,6 +122,7 @@ static void runLoopSourceCallback(void *info) {
[_condition lock]; [_condition lock];
[self performSelector:@selector(_stop) onThread:_thread withObject:nil waitUntilDone:NO]; [self performSelector:@selector(_stop) onThread:_thread withObject:nil waitUntilDone:NO];
[_condition wait]; [_condition wait];
// At this moment, the thread is guaranteed to be finished running.
[_condition unlock]; [_condition unlock];
_thread = nil; _thread = nil;
} }