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

Make marked conservatively statistic accumulative.

Browse source
This commit is contained in:
Han-Wen Nienhuys 2008-08-16 15:34:04 -03:00
parent 676d9cc553
commit 5bfb683e12
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/gc.c
View file

@ -216,6 +216,7 @@ scm_t_sweep_statistics scm_i_gc_sweep_stats = { 0, 0 };
/* Total count of cells marked/swept. */ /* Total count of cells marked/swept. */
static double scm_gc_cells_marked_acc = 0.; static double scm_gc_cells_marked_acc = 0.;
static double scm_gc_cells_marked_conservatively_acc = 0.;
static double scm_gc_cells_swept_acc = 0.; static double scm_gc_cells_swept_acc = 0.;
static double scm_gc_cells_allocated_acc = 0.; static double scm_gc_cells_allocated_acc = 0.;
@ -315,9 +316,9 @@ SCM_DEFINE (scm_gc_stats, "gc-stats", 0, 0, 0,
unsigned long int local_scm_gc_times; unsigned long int local_scm_gc_times;
unsigned long int local_scm_gc_mark_time_taken; unsigned long int local_scm_gc_mark_time_taken;
unsigned long int local_protected_obj_count; unsigned long int local_protected_obj_count;
unsigned long int local_conservative_scan_count;
double local_scm_gc_cells_swept; double local_scm_gc_cells_swept;
double local_scm_gc_cells_marked; double local_scm_gc_cells_marked;
double local_scm_gc_cells_marked_conservatively;
double local_scm_total_cells_allocated; double local_scm_total_cells_allocated;
SCM answer; SCM answer;
unsigned long *bounds = 0; unsigned long *bounds = 0;
@ -329,7 +330,6 @@ SCM_DEFINE (scm_gc_stats, "gc-stats", 0, 0, 0,
/* Below, we cons to produce the resulting list. We want a snapshot of /* Below, we cons to produce the resulting list. We want a snapshot of
* the heap situation before consing. * the heap situation before consing.
*/ */
local_conservative_scan_count = scm_i_find_heap_calls;
local_scm_mtrigger = scm_mtrigger; local_scm_mtrigger = scm_mtrigger;
local_scm_mallocated = scm_mallocated; local_scm_mallocated = scm_mallocated;
local_scm_heap_size = local_scm_heap_size =
@ -348,8 +348,10 @@ SCM_DEFINE (scm_gc_stats, "gc-stats", 0, 0, 0,
(double) scm_gc_cells_swept_acc (double) scm_gc_cells_swept_acc
+ (double) scm_i_gc_sweep_stats.swept; + (double) scm_i_gc_sweep_stats.swept;
local_scm_gc_cells_marked = scm_gc_cells_marked_acc local_scm_gc_cells_marked = scm_gc_cells_marked_acc
+(double) scm_i_gc_sweep_stats.swept + (double) scm_i_gc_sweep_stats.swept
-(double) scm_i_gc_sweep_stats.collected; - (double) scm_i_gc_sweep_stats.collected;
local_scm_gc_cells_marked_conservatively
= scm_gc_cells_marked_conservatively_acc;
local_scm_total_cells_allocated = scm_gc_cells_allocated_acc local_scm_total_cells_allocated = scm_gc_cells_allocated_acc
+ (double) scm_i_gc_sweep_stats.collected; + (double) scm_i_gc_sweep_stats.collected;
@ -373,7 +375,7 @@ SCM_DEFINE (scm_gc_stats, "gc-stats", 0, 0, 0,
scm_cons (sym_heap_size, scm_cons (sym_heap_size,
scm_from_ulong (local_scm_heap_size)), scm_from_ulong (local_scm_heap_size)),
scm_cons (sym_cells_marked_conservatively, scm_cons (sym_cells_marked_conservatively,
scm_from_ulong (local_conservative_scan_count)), scm_from_ulong (local_scm_gc_cells_marked_conservatively)),
scm_cons (sym_mallocated, scm_cons (sym_mallocated,
scm_from_ulong (local_scm_mallocated)), scm_from_ulong (local_scm_mallocated)),
scm_cons (sym_mtrigger, scm_cons (sym_mtrigger,
@ -416,6 +418,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_cells_allocated;
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;
++scm_gc_times; ++scm_gc_times;
@ -597,6 +600,9 @@ scm_i_gc (const char *what)
scm_check_deprecated_memory_return(); scm_check_deprecated_memory_return();
/* Sanity check our numbers. */ /* Sanity check our numbers. */
/* If this was not true, someone touched mark bits outside of the
mark phase. */
assert (scm_cells_allocated == scm_i_marked_count ()); assert (scm_cells_allocated == 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
@ -649,12 +655,10 @@ scm_i_gc (const char *what)
/* Invalidate the freelists of other threads. */ /* Invalidate the freelists of other threads. */
scm_i_thread_invalidate_freelists (); scm_i_thread_invalidate_freelists ();
assert(scm_cells_allocated == scm_i_marked_count ());
scm_c_hook_run (&scm_after_sweep_c_hook, 0); scm_c_hook_run (&scm_after_sweep_c_hook, 0);
gc_end_stats (); gc_end_stats ();
assert(scm_cells_allocated == scm_i_marked_count ());
scm_i_gc_sweep_stats.collected = scm_i_gc_sweep_stats.swept = 0; scm_i_gc_sweep_stats.collected = scm_i_gc_sweep_stats.swept = 0;
scm_i_gc_sweep_freelist_reset (&scm_i_master_freelist); scm_i_gc_sweep_freelist_reset (&scm_i_master_freelist);