gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 01:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

GC changes for MacOS-X compatiblity

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27630 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-01-19 11:00:33 +00:00
parent 8a5a8ba8eb
commit c41bdeb638
20 changed files with 537 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/NSNotificationCenter.m
View file

@ -47,6 +47,8 @@
#define purgeCollected(X) (X)
#endif
static NSZone *_zone = 0;
/**
* Concrete class implementing NSNotification.
*/
@ -286,7 +288,7 @@ static Observation *obsNew(NCTable* t)
size = CHUNKSIZE * sizeof(Observation);
#if GS_WITH_GC
t->chunks[t->numChunks - 1]
= (Observation*)NSZoneMallocAtomic(NSDefaultMallocZone(), size);
= (Observation*)NSZoneMalloc(GSAtomicMallocZone(), size);
#else
t->chunks[t->numChunks - 1]
= (Observation*)NSZoneMalloc(NSDefaultMallocZone(), size);
@ -312,8 +314,8 @@ static GSIMapTable mapNew(NCTable *t)
{
GSIMapTable m;
m = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(m, NSDefaultMallocZone(), 2);
m = NSZoneMalloc(_zone, sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(m, _zone, 2);
return m;
}
}
@ -399,16 +401,16 @@ static NCTable *newNCTable(void)
{
NCTable *t;
t = (NCTable*)NSZoneMalloc(NSDefaultMallocZone(), sizeof(NCTable));
t = (NCTable*)NSZoneMalloc(_zone, sizeof(NCTable));
memset((void*)t, '\0', sizeof(NCTable));
t->chunkIndex = CHUNKSIZE;
t->wildcard = ENDOBS;
t->nameless = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(t->nameless, NSDefaultMallocZone(), 16);
t->nameless = NSZoneMalloc(_zone, sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(t->nameless, _zone, 16);
t->named = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(t->named, NSDefaultMallocZone(), 128);
t->named = NSZoneMalloc(_zone, sizeof(GSIMapTable_t));
GSIMapInitWithZoneAndCapacity(t->named, _zone, 128);
// t->_lock = [GSLazyRecursiveLock new];
t->_lock = [NSRecursiveLock new];
@ -582,6 +584,11 @@ static NSNotificationCenter *default_center = nil;
{
if (self == [NSNotificationCenter class])
{
#if GS_WITH_GC
_zone = GSScannedMallocZone();
#else
_zone = NSDefaultMallocZone();
#endif
if (concrete == 0)
{
concrete = [GSNotification class];
@ -1001,7 +1008,7 @@ static NSNotificationCenter *default_center = nil;
/*
* Initialise static array to store copies of observers.
*/
GSIArrayInitWithZoneAndStaticCapacity(a, NSDefaultMallocZone(), 64, i);
GSIArrayInitWithZoneAndStaticCapacity(a, _zone, 64, i);
/*
* Lock the table of observations while we traverse it.