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

Help avoid programs getting huge memory footprints when they don't need to.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23077 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-06-17 17:20:22 +00:00
parent 61e201d3fe
commit cefd7bacac
3 changed files with 32 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
2006-06-17 Richard Frith-Macdonald <rfm@gnu.org> 2006-06-17 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m: Fix memory leak. * Source/GSString.m: Fix memory leak.
* Source/NSAutoreleasePool.m: Optimise -emptyPool method.
* Source/NSRunLoop.m: Empty autorelease pool after firing each
timer/event so that huge memory footprints are less likely to occur.
2006-06-16 Richard Frith-Macdonald <rfm@gnu.org> 2006-06-16 Richard Frith-Macdonald <rfm@gnu.org>

68
Source/NSAutoreleasePool.m
View file

@ -319,6 +319,30 @@ static IMP initImp;
- (void) dealloc - (void) dealloc
{ {
struct autorelease_thread_vars *tv = ARP_THREAD_VARS; struct autorelease_thread_vars *tv = ARP_THREAD_VARS;
[self emptyPool];
/*
* Remove self from the linked list of pools in use.
* We already know that we have deallocated our child (if any),
* but we may have a parent which needs to know we have gone.
*/
if (tv->current_pool == self)
{
tv->current_pool = _parent;
}
if (_parent != nil)
{
_parent->_child = nil;
}
/* Don't deallocate ourself, just save us for later use. */
push_pool_to_cache (tv, self);
GSNOSUPERDEALLOC;
}
- (void) emptyPool
{
unsigned i; unsigned i;
Class classes[16]; Class classes[16];
IMP imps[16]; IMP imps[16];
@ -384,50 +408,6 @@ static IMP initImp;
released = released->next; released = released->next;
} }
} }
/*
* Remove self from the linked list of pools in use.
* We already know that we have deallocated our child (if any),
* but we may have a parent which needs to know we have gone.
*/
if (tv->current_pool == self)
{
tv->current_pool = _parent;
}
if (_parent != nil)
{
_parent->_child = nil;
}
/* Don't deallocate ourself, just save us for later use. */
push_pool_to_cache (tv, self);
GSNOSUPERDEALLOC;
}
- (void) emptyPool
{
struct autorelease_array_list *released;
if (_child)
{
[_child dealloc];
}
released = _released_head;
while (released)
{
unsigned int i;
for (i = 0; i < released->count; i++)
{
id anObject = released->objects[i];
released->objects[i] = nil;
[anObject release];
}
released->count = 0;
released = released->next;
}
_released = _released_head;
} }
- (void) _reallyDealloc - (void) _reallyDealloc

5
Source/NSRunLoop.m
View file

@ -405,6 +405,7 @@ static NSComparisonResult tSort(GSIArrayItem i0, GSIArrayItem i1)
- (void) _checkPerformers: (GSRunLoopCtxt*)context - (void) _checkPerformers: (GSRunLoopCtxt*)context
{ {
CREATE_AUTORELEASE_POOL(arp);
if (context != nil) if (context != nil)
{ {
GSIArray performers = context->performers; GSIArray performers = context->performers;
@ -462,9 +463,11 @@ static NSComparisonResult tSort(GSIArrayItem i0, GSIArrayItem i1)
{ {
[array[i] fire]; [array[i] fire];
RELEASE(array[i]); RELEASE(array[i]);
IF_NO_GC([arp emptyPool]);
} }
} }
} }
RELEASE(arp);
} }
/** /**
@ -793,6 +796,7 @@ extern IMP wRetImp;
&& ([timerDate(t) timeIntervalSinceReferenceDate] <= now)) && ([timerDate(t) timeIntervalSinceReferenceDate] <= now))
{ {
[t fire]; [t fire];
IF_NO_GC([arp emptyPool]);
now = GSTimeNow(); now = GSTimeNow();
} }
@ -831,6 +835,7 @@ extern IMP wRetImp;
RELEASE(min_timer); RELEASE(min_timer);
} }
GSNotifyASAP(); /* Post notifications. */ GSNotifyASAP(); /* Post notifications. */
IF_NO_GC([arp emptyPool]);
} }
_currentMode = savedMode; _currentMode = savedMode;
} }