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

bugfix for garbage collecting

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27787 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-02-04 20:47:09 +00:00
parent 9b44e4c7c5
commit eabab217de
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-02-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Use pointerValue rather than
nonretainedObjectValue to hold classes ... because the garbage
collector might collect the latter, and we really just need to
hold references to classes without sending messages to them.
2009-02-04 15:00-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSUnarchiver.m: Correct issue with printing class name

25
Source/NSBundle.m
View file

@ -669,7 +669,7 @@ _find_main_bundle_for_tool(NSString *toolName)
NSValue *value;
Class class = NSClassFromString(*fmClasses);
value = [NSValue valueWithNonretainedObject: class];
value = [NSValue valueWithPointer: (void*)class];
[bundle->_bundleClasses addObject: value];
@ -704,8 +704,8 @@ _find_main_bundle_for_tool(NSString *toolName)
{
for (j = 0; j < [l count]; j++)
{
if ([[l objectAtIndex: j] nonretainedObjectValue]
== [[b objectAtIndex:i] nonretainedObjectValue])
if ([[l objectAtIndex: j] pointerValue]
== [[b objectAtIndex:i] pointerValue])
{
[l removeObjectAtIndex:j];
}
@ -778,13 +778,13 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
}
[_loadingFrameworks
addObject: [NSValue valueWithNonretainedObject: (id)theClass]];
addObject: [NSValue valueWithPointer: (void*)theClass]];
return;
}
/* Store classes (but don't store categories) */
[((bptr)_loadingBundle)->_bundleClasses addObject:
[NSValue valueWithNonretainedObject: (id)theClass]];
[NSValue valueWithPointer: (void*)theClass]];
}
@ -1144,8 +1144,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
j = [bundleClasses count];
for (i = 0; i < j && found == NO; i++)
{
if ([[bundleClasses objectAtIndex: i]
nonretainedObjectValue] == aClass)
if ([[bundleClasses objectAtIndex: i] pointerValue] == (void*)aClass)
found = YES;
}
@ -1195,7 +1194,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
= [[NSMutableArray alloc] initWithCapacity: 2];
}
[bundle->_bundleClasses addObject:
[NSValue valueWithNonretainedObject: aClass]];
[NSValue valueWithPointer: (void*)aClass]];
}
}
[load_lock unlock];
@ -1439,7 +1438,7 @@ IF_NO_GC(
for (i = 0; i < j && found == NO; i++)
{
Class c = [[_bundleClasses objectAtIndex: i] nonretainedObjectValue];
Class c = (Class)[[_bundleClasses objectAtIndex: i] pointerValue];
if (c == theClass)
{
@ -1487,8 +1486,8 @@ IF_NO_GC(
[load_lock lock];
if (_principalClass == nil && [_bundleClasses count] > 0)
{
_principalClass = [[_bundleClasses objectAtIndex: 0]
nonretainedObjectValue];
_principalClass = (Class)[[_bundleClasses objectAtIndex: 0]
pointerValue];
}
[load_lock unlock];
}
@ -1549,7 +1548,7 @@ IF_NO_GC(
classEnumerator = [_loadingFrameworks objectEnumerator];
while ((class = [classEnumerator nextObject]) != nil)
{
[NSBundle _addFrameworkFromClass: [class nonretainedObjectValue]];
[NSBundle _addFrameworkFromClass: (Class)[class pointerValue]];
}
/* After we load code from a bundle, we retain the bundle until
@ -1569,7 +1568,7 @@ IF_NO_GC(
while ((class = [classEnumerator nextObject]) != nil)
{
[classNames addObject:
NSStringFromClass([class nonretainedObjectValue])];
NSStringFromClass((Class)[class pointerValue])];
}
[load_lock unlock];