gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-11 00:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSURLSession: create dispatch queues using target and use lock instead of queue for session identifier

Browse source 
Creating stand-alone dispatch queues without a target is discouraged.
This commit is contained in:
Frederik Seiffert 2023-01-16 12:48:28 +01:00 committed by Frederik Seiffert
parent 15499e1017
commit 3c27683c03
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Source/NSURLSession.m
View file

@ -2,10 +2,11 @@
#import <curl/curl.h> #import <curl/curl.h>
#import "GSDispatch.h" #import "GSDispatch.h"
#import "GSMultiHandle.h"
#import "GSEasyHandle.h" #import "GSEasyHandle.h"
#import "GSTaskRegistry.h"
#import "GSHTTPURLProtocol.h" #import "GSHTTPURLProtocol.h"
#import "GSMultiHandle.h"
#import "GSPThread.h"
#import "GSTaskRegistry.h"
#import "GSURLSessionTaskBody.h" #import "GSURLSessionTaskBody.h"
#import "Foundation/NSError.h" #import "Foundation/NSError.h"
@ -91,24 +92,20 @@ typedef NS_ENUM(NSUInteger, NSURLSessionTaskProtocolState) {
NSURLSessionTaskProtocolStateInvalidated = 3, NSURLSessionTaskProtocolStateInvalidated = 3,
}; };
static dispatch_queue_t _globalVarSyncQ = NULL; static unsigned nextSessionIdentifier()
static int sessionCounter = 0;
static int nextSessionIdentifier()
{ {
if (NULL == _globalVarSyncQ) static gs_mutex_t lock = GS_MUTEX_INIT_STATIC;
{ static unsigned sessionCounter = 0;
_globalVarSyncQ = dispatch_queue_create("org.gnustep.NSURLSession.GlobalVarSyncQ", DISPATCH_QUEUE_SERIAL);
} GS_MUTEX_LOCK(lock);
dispatch_sync(_globalVarSyncQ, sessionCounter += 1;
^{ GS_MUTEX_UNLOCK(lock);
sessionCounter += 1;
});
return sessionCounter; return sessionCounter;
} }
@implementation NSURLSession @implementation NSURLSession
{ {
int _identifier;
dispatch_queue_t _workQueue; dispatch_queue_t _workQueue;
NSUInteger _nextTaskIdentifier; NSUInteger _nextTaskIdentifier;
BOOL _invalidated; BOOL _invalidated;
@ -162,15 +159,21 @@ static int nextSessionIdentifier()
if (nil != (self = [super init])) if (nil != (self = [super init]))
{ {
char label[30]; char label[30];
dispatch_queue_t targetQueue;
_taskRegistry = [[GSTaskRegistry alloc] init]; _taskRegistry = [[GSTaskRegistry alloc] init];
#if defined(CURLSSLBACKEND_GNUTLS) #if defined(CURLSSLBACKEND_GNUTLS)
curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL)l curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL)l
#endif #endif
curl_global_init(CURL_GLOBAL_SSL); curl_global_init(CURL_GLOBAL_SSL);
_identifier = nextSessionIdentifier(); sprintf(label, "NSURLSession %u", nextSessionIdentifier());
sprintf(label, "NSURLSession %d", _identifier); targetQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
_workQueue = dispatch_queue_create(label, DISPATCH_QUEUE_SERIAL); #if HAVE_DISPATCH_QUEUE_CREATE_WITH_TARGET
_workQueue = dispatch_queue_create_with_target(label, DISPATCH_QUEUE_SERIAL, targetQueue);
#else
_workQueue = dispatch_queue_create(label, DISPATCH_QUEUE_SERIAL);
dispatch_set_target_queue(_queue, targetQueue);
#endif
if (nil != queue) if (nil != queue)
{ {
ASSIGN(_delegateQueue, queue); ASSIGN(_delegateQueue, queue);
@ -596,14 +599,12 @@ static int nextSessionIdentifier()
{ {
NSURLSessionTask *task = [protocol task]; NSURLSessionTask *task = [protocol task];
NSURLSession *session; NSURLSession *session;
NSOperationQueue *delegateQueue;
id<NSURLSessionDelegate> delegate; id<NSURLSessionDelegate> delegate;
NSAssert(nil != task, @"Missing task"); NSAssert(nil != task, @"Missing task");
session = [task session]; session = [task session];
delegate = [session delegate]; delegate = [session delegate];
delegateQueue = [session delegateQueue];
switch (_cachePolicy) switch (_cachePolicy)
{ {
@ -625,7 +626,7 @@ static int nextSessionIdentifier()
&& [delegate respondsToSelector: && [delegate respondsToSelector:
@selector(URLSession:dataTask:didReceiveData:)]) @selector(URLSession:dataTask:didReceiveData:)])
{ {
[delegateQueue addOperationWithBlock: [[session delegateQueue] addOperationWithBlock:
^{ ^{
[(id<NSURLSessionDataDelegate>)delegate URLSession: session [(id<NSURLSessionDataDelegate>)delegate URLSession: session
dataTask: (NSURLSessionDataTask*)task dataTask: (NSURLSessionDataTask*)task