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

Try to manage count of connected clients better

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@38608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-06-10 08:05:59 +00:00
parent 85d8389ba0
commit 11bf21a930
1 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SQLClient.m
View file

@ -926,6 +926,9 @@ static int poolConnections = 0;
e = NSEnumerateHashTable(clientsHash); e = NSEnumerateHashTable(clientsHash);
while (nil != (o = (SQLClient*)NSNextHashEnumeratorItem(&e))) while (nil != (o = (SQLClient*)NSNextHashEnumeratorItem(&e)))
{ {
if (YES == o->connected)
{
connectionCount++;
if (since != nil) if (since != nil)
{ {
NSTimeInterval when = o->_lastOperation; NSTimeInterval when = o->_lastOperation;
@ -934,7 +937,7 @@ static int poolConnections = 0;
{ {
when = o->_lastStart; when = o->_lastStart;
} }
if (when < t && YES == o->connected) if (when < t)
{ {
if (nil == a) if (nil == a)
{ {
@ -943,9 +946,6 @@ static int poolConnections = 0;
[a addObject: o]; [a addObject: o];
} }
} }
else if ([o connected] == YES)
{
connectionCount++;
} }
} }
NSEndHashTableEnumeration(&e); NSEndHashTableEnumeration(&e);
@ -957,6 +957,8 @@ static int poolConnections = 0;
{ {
o = [a lastObject]; o = [a lastObject];
if ([o->lock tryLock]) if ([o->lock tryLock])
{
if (YES == o->connected)
{ {
NSTimeInterval when = o->_lastOperation; NSTimeInterval when = o->_lastOperation;
@ -964,15 +966,11 @@ static int poolConnections = 0;
{ {
when = o->_lastStart; when = o->_lastStart;
} }
if (when < t && YES == o->connected) if (when < t)
{ {
NS_DURING NS_DURING
{ {
[o disconnect]; [o disconnect];
if ([o connected] == YES)
{
connectionCount++;
}
} }
NS_HANDLER NS_HANDLER
{ {
@ -980,6 +978,11 @@ static int poolConnections = 0;
} }
NS_ENDHANDLER NS_ENDHANDLER
} }
}
if (NO == o->connected)
{
connectionCount--;
}
[o->lock unlock]; [o->lock unlock];
} }
[a removeLastObject]; [a removeLastObject];