gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

more lock tracing tweaks

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-03-26 16:35:17 +01:00
parent 75bf489aec
commit 82675cd3d9
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2018-03-26 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDebug.m:
Avoid recursion in lock tracing when using memory allocation stats.
* Source/NSObject.m:
Make gnustep_global_lock an untraced lock to avoid recursion issues
when tracing.
2018-03-26 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSLock.h:

18
Source/NSDebug.m
View file

@ -30,6 +30,7 @@
#import "common.h"
#include <stdio.h>
#import "GSPrivate.h"
#import "GSPThread.h"
#import "GNUstepBase/GSLock.h"
#import "Foundation/NSArray.h"
#import "Foundation/NSData.h"
@ -82,11 +83,7 @@ static table_entry* the_table = 0;
static BOOL debug_allocation = NO;
static NSRecursiveLock *uniqueLock = nil;
static SEL doLockSel = 0;
static SEL unLockSel = 0;
static IMP doLockImp = 0;
static IMP unLockImp = 0;
static pthread_mutex_t uniqueLock;
static void _GSDebugAllocationFetch(list_entry *items, BOOL difference);
static void _GSDebugAllocationFetchAll(list_entry *items);
@ -99,8 +96,8 @@ static void (*_GSDebugAllocationAddFunc)(Class c, id o)
static void (*_GSDebugAllocationRemoveFunc)(Class c, id o)
= _GSDebugAllocationRemove;
#define doLock() (*doLockImp)(uniqueLock, doLockSel)
#define unLock() (*unLockImp)(uniqueLock, unLockSel)
#define doLock() pthread_mutex_lock(&uniqueLock)
#define unLock() pthread_mutex_unlock(&uniqueLock)
@interface GSDebugAlloc : NSObject
+ (void) initialize;
@ -109,12 +106,7 @@ static void (*_GSDebugAllocationRemoveFunc)(Class c, id o)
@implementation GSDebugAlloc
+ (void) initialize
{
uniqueLock = [NSRecursiveLock new];
doLockSel = @selector(lock);
unLockSel = @selector(unlock);
doLockImp = [uniqueLock methodForSelector: doLockSel];
unLockImp = [uniqueLock methodForSelector: unLockSel];
[[NSObject leakAt: &uniqueLock] release];
GS_INIT_RECURSIVE_MUTEX(uniqueLock);
}
@end

2
Source/NSObject.m
View file

@ -1054,7 +1054,7 @@ static id gs_weak_load(id obj)
* must not call any other Objective-C classes and must not involve
* any use of the autorelease system.
*/
gnustep_global_lock = [NSRecursiveLock new];
gnustep_global_lock = [GSUntracedRecursiveLock new];
[gnustep_global_lock setName: @"gnustep_global_lock"];
/* Behavior debugging ... enable with environment variable if needed.