mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 13:00:26 +02:00
Code Activity

* Improved memory error handling.

Browse source 
* Made the behaviour of scm_gc_for_newcell more obvious.
This commit is contained in:
Dirk Herrmann 2000-06-30 13:48:28 +00:00
parent 685c0d7116
commit c73879189d
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/ChangeLog
View file

@ -1,3 +1,12 @@
2000-06-30 Dirk Herrmann <D.Herrmann@tu-bs.de>
* gc.c (alloc_some_heap): Use scm_memory_error to indicate a
failed attempt to get additional memory from the system.
(scm_gc_for_newcell): Changed the control structure to make the
behaviour explicit for the case that gc is not able to free any
cells.
2000-06-30 Dirk Herrmann <D.Herrmann@tu-bs.de> 2000-06-30 Dirk Herrmann <D.Herrmann@tu-bs.de>
* __scm.h (SCM_OUTOFRANGE): Removed. * __scm.h (SCM_OUTOFRANGE): Removed.

18
libguile/gc.c
View file

@ -698,7 +698,7 @@ scm_gc_for_newcell (scm_freelist_t *master, SCM *freelist)
++scm_ints_disabled; ++scm_ints_disabled;
do do
{ {
while (SCM_NULLP (master->clusters)) if (SCM_NULLP (master->clusters))
{ {
if (master->grow_heap_p || scm_block_gc) if (master->grow_heap_p || scm_block_gc)
{ {
@ -715,6 +715,12 @@ scm_gc_for_newcell (scm_freelist_t *master, SCM *freelist)
#endif #endif
scm_igc ("cells"); scm_igc ("cells");
adjust_min_yield (master); adjust_min_yield (master);
if (SCM_NULLP (master->clusters))
{
/* gc could not free any cells */
master->grow_heap_p = 0;
alloc_some_heap (master);
}
} }
} }
cell = SCM_CAR (master->clusters); cell = SCM_CAR (master->clusters);
@ -1962,7 +1968,10 @@ alloc_some_heap (scm_freelist_t *freelist)
SCM_SYSCALL (tmptable = ((scm_heap_seg_data_t *) SCM_SYSCALL (tmptable = ((scm_heap_seg_data_t *)
realloc ((char *)scm_heap_table, len))); realloc ((char *)scm_heap_table, len)));
if (!tmptable) if (!tmptable)
SCM_MISC_ERROR ("could not grow heap segment table", SCM_EOL); /* Dirk:FIXME:: scm_memory_error needs an additional message parameter.
* Here: "could not grow heap segment table".
*/
scm_memory_error (FUNC_NAME);
else else
scm_heap_table = tmptable; scm_heap_table = tmptable;
@ -2025,7 +2034,10 @@ alloc_some_heap (scm_freelist_t *freelist)
} }
} }
SCM_MISC_ERROR ("could not grow heap", SCM_EOL); /* Dirk:FIXME:: scm_memory_error needs an additional message parameter.
* Here: "could not grow heap".
*/
scm_memory_error (FUNC_NAME);
} }
#undef FUNC_NAME #undef FUNC_NAME