gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-21 19:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak to allow connections in a pool to share a cache effectively

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@38473 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2015-05-04 12:15:47 +00:00
parent 5e37d31fc3
commit 2244789514
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
SQLClient.m
View file

@ -722,6 +722,7 @@ NSString *SQLUniqueException = @"SQLUniqueException";
/**
* Container for all instances.
*/
static NSRecursiveLock *cacheLock = nil;
static NSHashTable *clientsHash = 0;
static NSMapTable *clientsMap = 0;
static NSRecursiveLock *clientsLock = nil;
@ -866,9 +867,10 @@ static int poolConnections = 0;
modes[0] = NSDefaultRunLoopMode;
queryModes = [[NSArray alloc] initWithObjects: modes count: 1];
GSTickerTimeNow();
[SQLRecord class]; // Force initialisation
[SQLRecord class]; // Force initialisatio
if (0 == clientsHash)
{
cacheLock = [NSRecursiveLock new];
clientsHash = NSCreateHashTable(NSNonOwnedPointerHashCallBacks, 0);
clientsMap = NSCreateMapTable(NSObjectMapKeyCallBacks,
NSNonRetainedObjectMapValueCallBacks, 0);
@ -2821,7 +2823,11 @@ static int poolConnections = 0;
{
GSCache *c;
[lock lock];
/* NB we use a different lock to protect the cache from the lock
* used to protect the database query. That allows multiple
* connections (a connection pool) to share the same cache.
*/
[cacheLock lock];
if (nil == _cache)
{
_cache = [GSCache new];
@ -2831,7 +2837,7 @@ static int poolConnections = 0;
}
}
c = [_cache retain];
[lock unlock];
[cacheLock unlock];
return [c autorelease];
}
@ -2969,7 +2975,11 @@ static int poolConnections = 0;
- (void) setCache: (GSCache*)aCache
{
[lock lock];
/* NB we use a different lock to protect the cache from the lock
* used to protect the database query. That allows multiple
* connections (a connection pool) to share the same cache.
*/
[cacheLock lock];
NS_DURING
{
if (_cacheThread != nil)
@ -2986,11 +2996,11 @@ static int poolConnections = 0;
}
NS_HANDLER
{
[lock unlock];
[cacheLock unlock];
[localException raise];
}
NS_ENDHANDLER
[lock unlock];
[cacheLock unlock];
}
- (void) setCacheThread: (NSThread*)aThread