mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-05 17:20:18 +02:00
Code Activity

Revise GC asserts.

Browse source 
* libguile/gc.c (scm_i_gc): Change assert into printed warning.

* libguile/private-gc.h (nil): introduce scm_i_last_marked_cell_count,
  as a private mechanism for maintaining cell counts.  Remove variable
  scm_cells_allocated.
This commit is contained in:
Han-Wen Nienhuys 2008-09-10 00:11:02 -03:00 • committed by Han-Wen Nienhuys
parent b48efb55b0
commit b71c8ec90a
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libguile/gc.c
View file

@ -416,7 +416,7 @@ gc_end_stats ()
scm_gc_cells_allocated_acc += scm_gc_cells_allocated_acc +=
(double) scm_i_gc_sweep_stats.collected; (double) scm_i_gc_sweep_stats.collected;
scm_gc_cells_marked_acc += (double) scm_cells_allocated; scm_gc_cells_marked_acc += (double) scm_i_last_marked_cell_count;
scm_gc_cells_marked_conservatively_acc += (double) scm_i_find_heap_calls; scm_gc_cells_marked_conservatively_acc += (double) scm_i_find_heap_calls;
scm_gc_cells_swept_acc += (double) scm_i_gc_sweep_stats.swept; scm_gc_cells_swept_acc += (double) scm_i_gc_sweep_stats.swept;
@ -558,6 +558,8 @@ scm_check_deprecated_memory_return ()
scm_i_deprecated_memory_return = 0; scm_i_deprecated_memory_return = 0;
} }
long int scm_i_last_marked_cell_count;
/* Must be called while holding scm_i_sweep_mutex. /* Must be called while holding scm_i_sweep_mutex.
This function is fairly long, but it touches various global This function is fairly long, but it touches various global
@ -598,16 +600,22 @@ scm_i_gc (const char *what)
scm_i_sweep_all_segments ("GC", &scm_i_gc_sweep_stats); scm_i_sweep_all_segments ("GC", &scm_i_gc_sweep_stats);
scm_check_deprecated_memory_return (); scm_check_deprecated_memory_return ();
#if (SCM_DEBUG_CELL_ACCESSES == 0 && SCM_SIZEOF_UNSIGNED_LONG ==4) #if (SCM_DEBUG_CELL_ACCESSES == 0 && SCM_SIZEOF_UNSIGNED_LONG == 4)
/* Sanity check our numbers. */ /* Sanity check our numbers. */
/* TODO(hanwen): figure out why the stats are off on x64_64. */ /* TODO(hanwen): figure out why the stats are off on x64_64. */
/* If this was not true, someone touched mark bits outside of the /* If this was not true, someone touched mark bits outside of the
mark phase. */ mark phase. */
assert (scm_cells_allocated == scm_i_marked_count ()); if (scm_i_last_marked_cell_count != scm_i_marked_count ())
{
static char msg[] =
"The number of marked objects changed since the last GC: %d vs %d.";
/* At some point, we should probably use a deprecation warning. */
fprintf(stderr, msg, scm_i_last_marked_cell_count, scm_i_marked_count ());
}
assert (scm_i_gc_sweep_stats.swept assert (scm_i_gc_sweep_stats.swept
== (scm_i_master_freelist.heap_total_cells == (scm_i_master_freelist.heap_total_cells
+ scm_i_master_freelist2.heap_total_cells)); + scm_i_master_freelist2.heap_total_cells));
assert (scm_i_gc_sweep_stats.collected + scm_cells_allocated assert (scm_i_gc_sweep_stats.collected + scm_i_last_marked_cell_count
== scm_i_gc_sweep_stats.swept); == scm_i_gc_sweep_stats.swept);
#endif /* SCM_DEBUG_CELL_ACCESSES */ #endif /* SCM_DEBUG_CELL_ACCESSES */
@ -617,8 +625,8 @@ scm_i_gc (const char *what)
scm_mark_all (); scm_mark_all ();
scm_gc_mark_time_taken += (scm_c_get_internal_run_time () - t_before_gc); scm_gc_mark_time_taken += (scm_c_get_internal_run_time () - t_before_gc);
scm_cells_allocated = scm_i_marked_count (); scm_i_last_marked_cell_count = scm_cells_allocated = scm_i_marked_count ();
/* Sweep /* Sweep
TODO: the after_sweep hook should probably be moved to just before TODO: the after_sweep hook should probably be moved to just before

1
libguile/gc.h
View file

@ -287,7 +287,6 @@ SCM_API struct scm_t_cell_type_statistics scm_i_master_freelist;
SCM_API struct scm_t_cell_type_statistics scm_i_master_freelist2; SCM_API struct scm_t_cell_type_statistics scm_i_master_freelist2;
SCM_API unsigned long scm_gc_malloc_collected; SCM_API unsigned long scm_gc_malloc_collected;
SCM_API unsigned long scm_cells_allocated;
SCM_API int scm_gc_malloc_yield_percentage; SCM_API int scm_gc_malloc_yield_percentage;
SCM_API unsigned long scm_mallocated; SCM_API unsigned long scm_mallocated;
SCM_API unsigned long scm_mtrigger; SCM_API unsigned long scm_mtrigger;

5
libguile/private-gc.h
View file

@ -273,8 +273,9 @@ SCM_INTERNAL void scm_i_sweep_all_segments (char const *reason,
SCM_INTERNAL SCM scm_i_all_segments_statistics (SCM hashtab); SCM_INTERNAL SCM scm_i_all_segments_statistics (SCM hashtab);
SCM_INTERNAL unsigned long *scm_i_segment_table_info(int *size); SCM_INTERNAL unsigned long *scm_i_segment_table_info(int *size);
extern long int scm_i_deprecated_memory_return; SCM_INTERNAL long int scm_i_deprecated_memory_return;
extern long int scm_i_find_heap_calls; SCM_INTERNAL long int scm_i_find_heap_calls;
SCM_INTERNAL long int scm_i_last_marked_cell_count;
/* /*
global init funcs. global init funcs.