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

Improve checking for a connection we can re-use

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@38834 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2015-07-23 07:11:57 +00:00
parent 0c59e4e5e7
commit 6114a2b053
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
SQLClientPool.m
View file

@ -208,7 +208,7 @@
NSTimeInterval start = [NSDate timeIntervalSinceReferenceDate];
NSTimeInterval now = start;
SQLClient *client = nil;
int connected = -1;
int preferred = -1;
int found = -1;
int cond = 0;
int index;
@ -224,15 +224,14 @@
if (_items[index].o == thread && _items[index].u < NSNotFound
&& NO == [_items[index].c isInTransaction])
{
connected = -1; // Ignore any other connected client
found = index;
preferred = index; // Ignore any other connected client
break;
}
if (nil == _items[index].o && 0 == _items[index].u)
{
if (connected < 0 && YES == [_items[index].c connected])
if (preferred < 0 && YES == [_items[index].c connected])
{
connected = index;
preferred = index;
}
else
{
@ -240,9 +239,9 @@
}
}
}
if (connected >= 0)
if (preferred >= 0)
{
found = connected; // Prefer a connected client.
found = preferred; // Prefer a connected client.
}
if (found >= 0)
{
@ -370,30 +369,40 @@
{
if (0 == _items[index].u)
{
if (connected >= 0 || found >= 0)
if (preferred >= 0 || found >= 0)
{
/* There's at least one more client available to be
* provided, so we want to re-lock with condition 1.
*/
cond = 1;
}
if (connected < 0 && YES == [_items[index].c connected])
if (preferred < 0 && YES == [_items[index].c connected])
{
connected = index;
preferred = index;
}
else
{
found = index;
}
}
else if (NO == isLocal
&& _items[index].o == thread
&& _items[index].u < NSNotFound
&& NO == [_items[index].c isInTransaction])
{
/* We are allowed to re-use connections in the current thread,
* so if we have found one, treat it as the preferred choice.
*/
preferred = index;
}
}
/* We prefer to use a client which is already connected, so we
* avoid opening unnecessary connections.
*/
if (connected >= 0)
if (preferred >= 0)
{
found = connected;
found = preferred;
}
if (YES == isLocal)
{