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

fixes for potential locking issues.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@36047 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-01-31 09:04:35 +00:00
parent 1f11ea97a9
commit 2e84577b69
2 changed files with 44 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2013-01-31 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.m: Check for -disconnect being called when inside a
transaction and handle locking properly in that case.
Change simple execute and query methods so they don't call -debug:
inside locked regions, in case the method has been overridden to
do something not safe in such locked sections (such as trying a
query in another thread to report extra debug info).
2012-11-29 Richard Frith-Macdonald <rfm@gnu.org>
* Wrap more code in exception handlers where there is any potential

45
SQLClient.m
View file

@ -1322,6 +1322,16 @@ static unsigned int maxConnections = 8;
NSNotificationCenter *nc;
[lock lock];
if (YES == _inTransaction)
{
/* If we are inside a transaction we must be doubly locked,
* so we do an unlock corresponding to the -begin before we
* disconnect (the disconnect implicitly rolls back the
* transaction).
*/
_inTransaction = NO;
[lock unlock];
}
if (connected == YES)
{
NS_DURING
@ -1850,6 +1860,7 @@ static unsigned int maxConnections = 8;
- (NSInteger) simpleExecute: (NSArray*)info
{
NSInteger result;
NSString *debug = nil;
[lock lock];
NS_DURING
@ -1886,21 +1897,24 @@ static unsigned int maxConnections = 8;
{
if (isCommit || isRollback)
{
NSEnumerator *e = [_statements objectEnumerator];
NSEnumerator *e = [_statements objectEnumerator];
NSMutableString *m;
if (isCommit)
{
[self debug:
@"Duration %g for transaction commit ...", d];
m = [NSMutableString stringWithFormat:
@"Duration %g for transaction commit ...\n", d];
}
else
{
[self debug:
@"Duration %g for transaction rollback ...", d];
m = [NSMutableString stringWithFormat:
@"Duration %g for transaction rollback ...\n", d];
}
while ((statement = [e nextObject]) != nil)
{
[self debug: @" %@;", statement];
[m appendFormat: @" %@;\n", statement];
}
debug = m;
}
else if ([self debugging] > 1)
{
@ -1908,12 +1922,13 @@ static unsigned int maxConnections = 8;
* For higher debug levels, we log data objects as well
* as the query string, otherwise we omit them.
*/
[self debug: @"Duration %g for statement %@", d, info];
debug = [NSString stringWithFormat:
@"Duration %g for statement %@", d, info];
}
else
{
[self debug: @"Duration %g for statement %@",
d, statement];
debug = [NSString stringWithFormat:
@"Duration %g for statement %@", d, statement];
}
}
}
@ -1934,6 +1949,10 @@ static unsigned int maxConnections = 8;
}
NS_ENDHANDLER
[lock unlock];
if (nil != debug)
{
[self debug: @"%@", debug];
}
return result;
}
@ -1947,6 +1966,7 @@ static unsigned int maxConnections = 8;
listType: (id)ltype
{
NSMutableArray *result = nil;
NSString *debug = nil;
if (rtype == 0) rtype = rClass;
if (ltype == 0) ltype = aClass;
@ -1968,7 +1988,8 @@ static unsigned int maxConnections = 8;
d = _lastOperation - start;
if (d >= _duration)
{
[self debug: @"Duration %g for query %@", d, stmt];
debug = [NSString stringWithFormat:
@"Duration %g for query %@", d, stmt];
}
}
}
@ -1979,6 +2000,10 @@ static unsigned int maxConnections = 8;
}
NS_ENDHANDLER
[lock unlock];
if (nil != debug)
{
[self debug: @"%@", debug];
}
return result;
}