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

more GC improvements

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28220 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-04-15 08:03:19 +00:00
parent 4fa65f0c82
commit cfb566ed22
10 changed files with 415 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Source/NSZone.m
View file

@ -95,6 +95,20 @@
#include "Foundation/NSString.h"
#include "Foundation/NSZone.h"
#include "Foundation/NSLock.h"
#include "GSPrivate.h"
/**
* Try to get more memory - the normal process has failed.
* If we can't do anything, just return a null pointer.
* Try to do some logging if possible.
*/
void *
GSOutOfMemory(NSUInteger size, BOOL retry)
{
fprintf(stderr, "GSOutOfMemory ... wanting %lu bytes.\n",
(unsigned long)size);
return 0;
}
/* Default zone functions for default zone. */
static void* default_malloc (NSZone *zone, size_t size);
@ -196,9 +210,6 @@ NSZone *__nszone_private_hidden_default_zone = &default_zone;
/**
* Sets name of the given zone (useful for debugging and logging).
*/
void
NSSetZoneName (NSZone *zone, NSString *name)
{
@ -452,21 +463,15 @@ NSZoneFree (NSZone *zone, void *ptr)
}
}
#else /* GS_WITH_GC */
/**
* Try to get more memory - the normal process has failed.
* If we can't do anything, just return a null pointer.
* Try to do some logging if possible.
*/
void *
GSOutOfMemory(NSUInteger size, BOOL retry)
BOOL
GSPrivateIsCollectable(const void *ptr)
{
fprintf(stderr, "GSOutOfMemory ... wanting %lu bytes.\n",
(unsigned long)size);
return 0;
if (GC_base((void*)ptr) == 0) return NO;
else return YES;
}
#else /* GS_WITH_GC */
/* Alignment */
#ifdef ALIGN
@ -1818,10 +1823,6 @@ rrealloc (NSZone *zone, void *ptr, size_t size)
static void rnfree (NSZone *zone, void *ptr);
/**
* Searches and finds the zone ptr was allocated from. The speed depends
* upon the number of zones and their size.
*/
GS_DECLARE NSZone*
NSZoneFromPointer(void *ptr)
{
@ -1845,14 +1846,6 @@ NSZoneFromPointer(void *ptr)
return (zone == 0) ? &default_zone : zone;
}
/**
* Creates a new zone of start bytes, which will grow and shrink by
* granularity bytes. If canFree is 0, memory in zone is allocated but
* never freed, meaning allocation will be very fast. The whole zone can
* still be freed with NSRecycleZone(), and you should still call NSZoneFree
* on memory in the zone that is no longer needed, since a count of allocated
* pointers is kept and must reach zero before freeing the zone.
*/
NSZone*
NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree)
{
@ -1968,12 +1961,6 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree)
return newZone;
}
/**
* Allocates and returns cleared memory for elems items of size bytes, in the
* given zone. Returns NULL if allocation of size 0 requested. Raises
* <code>NSMallocException</code> if not enough free memory in zone to
* allocate and no more can be obtained from system.
*/
void*
NSZoneCalloc (NSZone *zone, NSUInteger elems, NSUInteger bytes)
{
@ -2069,4 +2056,10 @@ NSZoneStats (NSZone *zone)
return (zone->stats)(zone);
}
BOOL
GSPrivateIsCollectable(const void *ptr)
{
return NO;
}
#endif /* GS_WITH_GC */