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

try to improve startup reliability

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-04-12 18:08:53 +01:00
parent bb85bd426c
commit bc2dd4b627
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/NSCharacterSet.m
View file

@ -27,12 +27,11 @@
*/
#import "common.h"
#import "GNUstepBase/GSLock.h"
#import "GSPThread.h"
#import "Foundation/NSArray.h"
#import "Foundation/NSCoder.h"
#import "Foundation/NSException.h"
#import "Foundation/NSData.h"
#import "Foundation/NSLock.h"
#import "Foundation/NSDictionary.h"
#import "Foundation/NSIndexSet.h"
#import "Foundation/NSThread.h"
@ -540,7 +539,6 @@
/* A simple array for caching standard bitmap sets */
#define MAX_STANDARD_SETS 15
static NSCharacterSet *cache_set[MAX_STANDARD_SETS];
static NSLock *cache_lock = nil;
static Class abstractClass = nil;
static Class abstractMutableClass = nil;
static Class concreteClass = nil;
@ -649,8 +647,6 @@ static Class concreteMutableClass = nil;
concreteClass = [NSBitmapCharSet class];
concreteMutableClass = [NSMutableBitmapCharSet class];
#endif
cache_lock = [NSLock new];
[[NSObject leakAt: &cache_lock] release];
beenHere = YES;
}
}
@ -664,7 +660,9 @@ static Class concreteMutableClass = nil;
length: (unsigned)length
number: (int)number
{
[cache_lock lock];
static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_lock(&cache_lock);
if (cache_set[number] == nil && bytes != 0)
{
NSData *bitmap;
@ -677,7 +675,7 @@ static Class concreteMutableClass = nil;
[[NSObject leakAt: &cache_set[number]] release];
RELEASE(bitmap);
}
[cache_lock unlock];
pthread_mutex_unlock(&cache_lock);
return cache_set[number];
}