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

make aware of tiny strings

Browse source
This commit is contained in:
Richard Frith-Macdonald 2020-02-27 14:55:59 +00:00
parent a9588e8073
commit c3557e74be
2 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,6 +1,13 @@
2020-02-27 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.m: Make the code aware of the tiny string class used by
the gnustep base library. Treat tiny strings as literal strings
because, unfortunately, we can't tell if they were created at
compile time or at run time.
2020-02-25 Richard Frith-Macdonald <rfm@gnu.org> 2020-02-25 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.m: Changes t -release to avoid deadlock purging pool. * SQLClient.m: Changes to -release to avoid deadlock purging pool.
2020-02-14 Richard Frith-Macdonald <rfm@gnu.org> 2020-02-14 Richard Frith-Macdonald <rfm@gnu.org>

54
SQLClient.m
View file

@ -88,6 +88,7 @@ static Class NSSetClass = Nil;
static Class SQLClientClass = Nil; static Class SQLClientClass = Nil;
static Class LitProxyClass = Nil; static Class LitProxyClass = Nil;
static Class LitStringClass = Nil; static Class LitStringClass = Nil;
static Class TinyStringClass = Nil;
static Class SQLStringClass = Nil; static Class SQLStringClass = Nil;
static unsigned SQLStringSize = 0; static unsigned SQLStringSize = 0;
@ -249,7 +250,8 @@ SQLClientIsLiteral(NSString *aString)
{ {
Class c = object_getClass(aString); Class c = object_getClass(aString);
if (c == LitStringClass || c == SQLStringClass || c == LitProxyClass) if (c == LitStringClass || c == TinyStringClass
|| c == SQLStringClass || c == LitProxyClass)
{ {
return YES; return YES;
} }
@ -284,7 +286,7 @@ SQLClientCopyLiteral(NSString *aString)
aString = ((SQLLiteralProxy*)aString)->content; aString = ((SQLLiteralProxy*)aString)->content;
c = object_getClass(aString); c = object_getClass(aString);
} }
if (c != LitStringClass && c != SQLStringClass) if (c != LitStringClass && c != TinyStringClass && c != SQLStringClass)
{ {
const char *p = [aString UTF8String]; const char *p = [aString UTF8String];
int l = strlen(p); int l = strlen(p);
@ -311,7 +313,7 @@ SQLClientMakeLiteral(NSString *aString)
aString = ((SQLLiteralProxy*)aString)->content; aString = ((SQLLiteralProxy*)aString)->content;
c = object_getClass(aString); c = object_getClass(aString);
} }
if (c != LitStringClass && c != SQLStringClass) if (c != LitStringClass && c != TinyStringClass && c != SQLStringClass)
{ {
const char *p = [aString UTF8String]; const char *p = [aString UTF8String];
int l = strlen(p); int l = strlen(p);
@ -362,13 +364,15 @@ SQLClientUnProxyLiteral(id aString)
{ {
aString = ((SQLLiteralProxy*)aString)->content; aString = ((SQLLiteralProxy*)aString)->content;
} }
else if (c != LitStringClass && c != SQLStringClass) else if (c != LitStringClass
&& c != TinyStringClass
&& c != SQLStringClass)
{ {
aString = [aString description]; aString = [aString description];
if (YES == autoquoteWarning) if (YES == autoquoteWarning)
{ {
NSLog(@"SQLClient expected SQLLiteral type for %@ %@", NSLog(@"SQLClient expected SQLLiteral type for %@ (%@)",
NSStringFromClass(c), aString); aString, NSStringFromClass(c));
} }
} }
} }
@ -1275,8 +1279,10 @@ static int poolConnections = 0;
if (Nil == LitStringClass) if (Nil == LitStringClass)
{ {
/* Find the literal string class used by the foundation library. /* Find the literal string class used by the foundation library.
* We may have two varieties.
*/ */
LitStringClass = object_getClass(@"test"); LitStringClass = object_getClass(@"test string");
TinyStringClass = object_getClass(@"test");
SQLStringClass = [SQLString class]; SQLStringClass = [SQLString class];
SQLStringSize = class_getInstanceSize(SQLStringClass); SQLStringSize = class_getInstanceSize(SQLStringClass);
@ -1962,12 +1968,15 @@ static int poolConnections = 0;
{ {
tmp = ((SQLLiteralProxy*)tmp)->content; tmp = ((SQLLiteralProxy*)tmp)->content;
} }
else if (c != LitStringClass && c != SQLStringClass) else if (c != LitStringClass
&& c != TinyStringClass
&& c != SQLStringClass)
{ {
if (nil == warn) if (nil == warn)
{ {
warn = [NSString stringWithFormat: warn = [NSString stringWithFormat:
@"\"%@\" (argument %u)", tmp, index]; @"\"%@\" (argument %u, %@)",
tmp, index, NSStringFromClass(c)];
} }
if (YES == autoquote) if (YES == autoquote)
{ {
@ -2144,12 +2153,15 @@ static int poolConnections = 0;
{ {
v = ((SQLLiteralProxy*)o)->content; v = ((SQLLiteralProxy*)o)->content;
} }
else if (c != LitStringClass && c != SQLStringClass) else if (c != LitStringClass
&& c != TinyStringClass
&& c != SQLStringClass)
{ {
if (nil == warn) if (nil == warn)
{ {
warn = [NSString stringWithFormat: warn = [NSString stringWithFormat:
@"\"%@\" (value for \"%@\")", o, k]; @"\"%@\" (value for \"%@\", %@)",
o, k, NSStringFromClass(c)];
} }
if (YES == autoquote) if (YES == autoquote)
{ {
@ -2484,22 +2496,19 @@ static int poolConnections = 0;
- (oneway void) release - (oneway void) release
{ {
/* We lock the table while checking, to prevent another thread /* We lock the table while checking, to prevent
* from grabbing this object while we are checking it. * another thread from grabbing this object while we are
* checking it.
* If we are going to deallocate the object, we first remove
* it from the table so that no other thread will find it
* and try to use it while it is being deallocated.
*/ */
[clientsLock lock]; [clientsLock lock];
if (nil != _pool && [self retainCount] == 1) if (nil != _pool && [self retainCount] == 1)
{ {
/* This is the only reference to a client associated with /* If this is the only reference to a client associated with
* a connection pool we put this client back to the pool. * a connection pool we put this client back to the pool.
* *
* That being the case, we know that this thread 'owns'
* the client and it's not going to be deallocated and not
* going to have the _pool iinstance variable changed, so it
* is safe to unlock clientsLock before returning the client
* to the pool. This avoids a possible deadlock when a pool
* is being purged.
*
* wl 2019-05-01: The original implementation was calling this code * wl 2019-05-01: The original implementation was calling this code
* when NSDecrementExtraRefCountWasZero returns YES, but * when NSDecrementExtraRefCountWasZero returns YES, but
* this does not work with newer versions of the GNUstep * this does not work with newer versions of the GNUstep
@ -2507,14 +2516,13 @@ static int poolConnections = 0;
* Objective-C runtime, which both don't handle resurrection * Objective-C runtime, which both don't handle resurrection
* gracefully for objects whose retain count has become zero. * gracefully for objects whose retain count has become zero.
*/ */
[clientsLock unlock];
[_pool _swallowClient: self explicit: NO]; [_pool _swallowClient: self explicit: NO];
} }
else else
{ {
[super release]; [super release];
[clientsLock unlock];
} }
[clientsLock unlock];
} }
- (SQLClientPool*) pool - (SQLClientPool*) pool