gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSZombie fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32051 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-02-11 10:00:00 +00:00
parent 35fea0d5da
commit b18855d42a
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,5 @@
2011-02-11 Richard Frith-Macdonald <rfm@gnu.org> 2011-02-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m:
* Source/NSArray.m: * Source/NSArray.m:
* Source/NSString.m: * Source/NSString.m:
* Source/NSPointerArray.m: * Source/NSPointerArray.m:
@ -8,6 +7,8 @@
Tweaks to try to avoid clang analyser warnings. Tweaks to try to avoid clang analyser warnings.
* Source/NSPropertyList.m: * Source/NSPropertyList.m:
Revert last change. Revert last change.
* Source/NSObject.m:
Rewrite zombie setup code to avoid crashes caused by latest change.
2011-02-11 Stefan Bidigaray <stefanbidi@gmail.com> 2011-02-11 Stefan Bidigaray <stefanbidi@gmail.com>

24
Source/NSObject.m
View file

@ -127,15 +127,22 @@ BOOL NSZombieEnabled = NO;
BOOL NSDeallocateZombies = NO; BOOL NSDeallocateZombies = NO;
@class NSZombie; @class NSZombie;
static Class zombieClass; static NSMapTable *zombieMap = 0;
static NSMapTable *zombieMap;
#if !GS_WITH_GC #if !GS_WITH_GC
static void GSMakeZombie(NSObject *o) static void GSMakeZombie(NSObject *o)
{ {
Class c = ((id)o)->class_pointer; static Class zombieClass = Nil;
Class c;
((id)o)->class_pointer = zombieClass; if (nil == zombieClass)
{
zombieMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0);
zombieClass = [NSZombie class];
}
c = object_getClass(o);
object_setClass(o, zombieClass);
if (NSDeallocateZombies == NO) if (NSDeallocateZombies == NO)
{ {
[allocationLock lock]; [allocationLock lock];
@ -961,18 +968,19 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
GSObjCBehaviorDebug(GSPrivateEnvironmentFlag("GNUSTEP_BEHAVIOR_DEBUG", GSObjCBehaviorDebug(GSPrivateEnvironmentFlag("GNUSTEP_BEHAVIOR_DEBUG",
GSObjCBehaviorDebug(-1))); GSObjCBehaviorDebug(-1)));
// Zombie management stuff. // Zombie management flags.
zombieMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0);
zombieClass = NSClassFromString(@"NSZombie");
NSZombieEnabled = GSPrivateEnvironmentFlag("NSZombieEnabled", NO); NSZombieEnabled = GSPrivateEnvironmentFlag("NSZombieEnabled", NO);
NSDeallocateZombies = GSPrivateEnvironmentFlag("NSDeallocateZombies", NO); NSDeallocateZombies = GSPrivateEnvironmentFlag("NSDeallocateZombies", NO);
// Set up the autorelease system
autorelease_class = [NSAutoreleasePool class]; autorelease_class = [NSAutoreleasePool class];
autorelease_sel = @selector(addObject:); autorelease_sel = @selector(addObject:);
autorelease_imp = [autorelease_class methodForSelector: autorelease_sel]; autorelease_imp = [autorelease_class methodForSelector: autorelease_sel];
// Make sure the constant string class works.
NSConstantStringClass = [NSString constantStringClass]; NSConstantStringClass = [NSString constantStringClass];
GSPrivateBuildStrings(); GSPrivateBuildStrings();
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
addObserver: self addObserver: self
selector: @selector(_becomeMultiThreaded:) selector: @selector(_becomeMultiThreaded:)