gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

relax limit on maximum concurrent operations

Browse source
This commit is contained in:
Richard Frith-Macdonald 2022-08-16 09:36:27 +01:00
parent fe14647b90
commit 560b1d19fb
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2022-08-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSOperation.m: Remove restriction (of 8) on the maximum
number of threads, and set that as the default value instead, so
the -setMaxConcurrentOperationCount: method can override it.
Thanks to https://github.com/wbardwel for the suggestion.
2022-08-11 Hugo Melder <contact@hugomelder.com>
* Tests/base/NSTimeZone/use.m:

18
Source/NSOperation.m
View file

@ -54,7 +54,7 @@
BOOL suspended; \
NSInteger executing; \
NSInteger threadCount; \
NSInteger count;
NSInteger maxThreads;
#import "Foundation/NSOperation.h"
#import "Foundation/NSArray.h"
@ -75,10 +75,6 @@ static void *isFinishedCtxt = (void*)"isFinished";
static void *isReadyCtxt = (void*)"isReady";
static void *queuePriorityCtxt = (void*)"queuePriority";
/* The pool of threads for 'non-concurrent' operations in a queue.
*/
#define POOL 8
static NSArray *empty = nil;
@interface NSOperation (Private)
@ -624,7 +620,7 @@ GS_PRIVATE_INTERNAL(NSOperationQueue)
context: (void *)context;
@end
static NSInteger maxConcurrent = 200; // Thread pool size
static NSInteger maxConcurrent = 8; // Thread pool size
static NSComparisonResult
sortFunc(id o1, id o2, void *ctxt)
@ -824,7 +820,7 @@ static NSOperationQueue *mainQueue = nil;
{
GS_CREATE_INTERNAL(NSOperationQueue);
internal->suspended = NO;
internal->count = NSOperationQueueDefaultMaxConcurrentOperationCount;
internal->maxThreads = NSOperationQueueDefaultMaxConcurrentOperationCount;
internal->operations = [NSMutableArray new];
internal->starting = [NSMutableArray new];
internal->waiting = [NSMutableArray new];
@ -845,7 +841,7 @@ static NSOperationQueue *mainQueue = nil;
- (NSInteger) maxConcurrentOperationCount
{
return internal->count;
return internal->maxThreads;
}
- (NSString*) name
@ -893,10 +889,10 @@ static NSOperationQueue *mainQueue = nil;
NSStringFromClass([self class]), NSStringFromSelector(_cmd), cnt];
}
[internal->lock lock];
if (cnt != internal->count)
if (cnt != internal->maxThreads)
{
[self willChangeValueForKey: @"maxConcurrentOperationCount"];
internal->count = cnt;
internal->maxThreads = cnt;
[self didChangeValueForKey: @"maxConcurrentOperationCount"];
}
[internal->lock unlock];
@ -1127,7 +1123,7 @@ static NSOperationQueue *mainQueue = nil;
* we haven't reached the pool limit.
*/
if (0 == internal->threadCount
|| (pending > 0 && internal->threadCount < POOL))
|| (pending > 0 && internal->threadCount < max))
{
internal->threadCount++;
NS_DURING