gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 17:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix race condition allowing operation to be added for a thread at the same time that the thread is exiting.

Browse source
This commit is contained in:
rfm 2025-01-06 20:55:55 +00:00
parent ccab2cdbd1
commit 1cdc60d748
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Source/NSOperation.m
View file

@ -1039,7 +1039,22 @@ static NSOperationQueue *mainQueue = nil;
RELEASE(when);
if (NO == found)
{
break; // Idle for 5 seconds ... exit thread.
[internal->cond lock];
if ([internal->starting count] == 0)
{
// Idle for 5 seconds ... exit thread.
[[[NSThread currentThread] threadDictionary]
removeObjectForKey: threadKey];
[internal->lock lock];
internal->threadCount--;
[internal->lock unlock];
[internal->cond unlock];
break;
}
/* An operation was added in the gap between the failed wait for
* the condition and us unconditionally locking the condition, so
* we fall through to execute that operation.
*/
}
if ([internal->starting count] > 0)
@ -1083,10 +1098,6 @@ static NSOperationQueue *mainQueue = nil;
}
}
[[[NSThread currentThread] threadDictionary] removeObjectForKey: threadKey];
[internal->lock lock];
internal->threadCount--;
[internal->lock unlock];
DESTROY(arp);
[NSThread exit];
}
@ -1139,18 +1150,19 @@ static NSOperationQueue *mainQueue = nil;
*/
if (internal->threadCount < max)
{
internal->threadCount++;
NSInteger count = internal->threadCount++;
NSNumber *threadNumber = [NSNumber numberWithInteger: count];
NS_DURING
{
NSNumber *threadNumber = [NSNumber numberWithInteger: internal->threadCount - 1];
[NSThread detachNewThreadSelector: @selector(_thread:)
toTarget: self
withObject: threadNumber];
}
NS_HANDLER
{
NSLog(@"Failed to create thread for %@: %@",
self, localException);
NSLog(@"Failed to create thread %@ for %@: %@",
threadNumber, self, localException);
}
NS_ENDHANDLER
}