-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define _GNU_SOURCE
#include <string.h>
#include <assert.h>
-#ifdef __ia64__
-#include <ucontext.h>
-extern unsigned long * __libc_ia64_register_backing_store_base;
-#endif
-
#include "libguile/_scm.h"
#include "libguile/eval.h"
#include "libguile/stime.h"
*/
unsigned long scm_mtrigger;
-/* During collection, this accumulates objects holding
- * weak references.
- */
-SCM scm_weak_vectors;
-
/* GC Statistics Keeping
*/
unsigned long scm_cells_allocated = 0;
unsigned long scm_mallocated = 0;
-unsigned long scm_gc_cells_collected;
-unsigned long scm_gc_cells_collected_1 = 0; /* previous GC yield */
-unsigned long scm_gc_malloc_collected;
-unsigned long scm_gc_ports_collected;
-unsigned long scm_gc_time_taken = 0;
+
+/* Global GC sweep statistics since the last full GC. */
+static scm_t_sweep_statistics scm_i_gc_sweep_stats = { 0, 0 };
+static scm_t_sweep_statistics scm_i_gc_sweep_stats_1 = { 0, 0 };
+
+/* Total count of cells marked/swept. */
+static double scm_gc_cells_marked_acc = 0.;
+static double scm_gc_cells_swept_acc = 0.;
+
+static unsigned long scm_gc_time_taken = 0;
static unsigned long t_before_gc;
-unsigned long scm_gc_mark_time_taken = 0;
-unsigned long scm_gc_times = 0;
-unsigned long scm_gc_cells_swept = 0;
-double scm_gc_cells_marked_acc = 0.;
-double scm_gc_cells_swept_acc = 0.;
-int scm_gc_cell_yield_percentage =0;
+static unsigned long scm_gc_mark_time_taken = 0;
+
+static unsigned long scm_gc_times = 0;
+
+static int scm_gc_cell_yield_percentage = 0;
+static unsigned long protected_obj_count = 0;
+
+/* The following are accessed from `gc-malloc.c' and `gc-card.c'. */
int scm_gc_malloc_yield_percentage = 0;
-unsigned long protected_obj_count = 0;
+unsigned long scm_gc_malloc_collected = 0;
+unsigned long scm_gc_ports_collected = 0;
SCM_SYMBOL (sym_cells_allocated, "cells-allocated");
static SCM
tag_table_to_type_alist (void *closure, SCM key, SCM val, SCM acc)
{
- scm_t_bits c_tag = scm_to_int (key);
+ if (scm_is_integer (key))
+ {
+ int c_tag = scm_to_int (key);
- char const * name = scm_i_tag_name (c_tag);
- if (name != NULL)
- key = scm_from_locale_string (name);
+ char const * name = scm_i_tag_name (c_tag);
+ if (name != NULL)
+ {
+ key = scm_from_locale_string (name);
+ }
+ else
+ {
+ char s[100];
+ sprintf (s, "tag %d", c_tag);
+ key = scm_from_locale_string (s);
+ }
+ }
return scm_cons (scm_cons (key, val), acc);
}
#define FUNC_NAME s_scm_gc_live_object_stats
{
SCM tab = scm_make_hash_table (scm_from_int (57));
+ SCM alist;
+
scm_i_all_segments_statistics (tab);
- SCM alist
+ alist
= scm_internal_hash_fold (&tag_table_to_type_alist, NULL, SCM_EOL, tab);
return alist;
temporarily store the numbers, so as not to cause GC.
*/
- bounds = malloc (sizeof (int) * table_size * 2);
+ bounds = malloc (sizeof (unsigned long) * table_size * 2);
if (!bounds)
abort();
for (i = table_size; i--; )
local_protected_obj_count = protected_obj_count;
local_scm_gc_cells_swept =
(double) scm_gc_cells_swept_acc
- + (double) scm_gc_cells_swept;
+ + (double) scm_i_gc_sweep_stats.swept;
local_scm_gc_cells_marked = scm_gc_cells_marked_acc
- +(double) scm_gc_cells_swept
- -(double) scm_gc_cells_collected;
+ +(double) scm_i_gc_sweep_stats.swept
+ -(double) scm_i_gc_sweep_stats.collected;
for (i = table_size; i--;)
{
}
#undef FUNC_NAME
+/* Update the global sweeping/collection statistics by adding SWEEP_STATS to
+ SCM_I_GC_SWEEP_STATS and updating related variables. */
+static inline void
+gc_update_stats (scm_t_sweep_statistics sweep_stats)
+{
+ /* CELLS SWEPT is another word for the number of cells that were examined
+ during GC. YIELD is the number that we cleaned out. MARKED is the number
+ that weren't cleaned. */
+
+ scm_gc_cell_yield_percentage = (sweep_stats.collected * 100) / SCM_HEAP_SIZE;
+
+ scm_i_sweep_statistics_sum (&scm_i_gc_sweep_stats, sweep_stats);
+
+ if ((scm_i_gc_sweep_stats.collected > scm_i_gc_sweep_stats.swept)
+ || (scm_cells_allocated < sweep_stats.collected))
+ {
+ printf ("internal GC error, please report to `"
+ PACKAGE_BUGREPORT "'\n");
+ abort ();
+ }
+
+ scm_cells_allocated -= sweep_stats.collected;
+}
+
static void
gc_start_stats (const char *what SCM_UNUSED)
{
t_before_gc = scm_c_get_internal_run_time ();
- scm_gc_cells_marked_acc += (double) scm_gc_cells_swept
- - (double) scm_gc_cells_collected;
- scm_gc_cells_swept_acc += (double) scm_gc_cells_swept;
-
- scm_gc_cell_yield_percentage = ( scm_gc_cells_collected * 100 ) / SCM_HEAP_SIZE;
-
- scm_gc_cells_swept = 0;
- scm_gc_cells_collected_1 = scm_gc_cells_collected;
-
- /*
- CELLS SWEPT is another word for the number of cells that were
- examined during GC. YIELD is the number that we cleaned
- out. MARKED is the number that weren't cleaned.
- */
- scm_gc_cells_collected = 0;
scm_gc_malloc_collected = 0;
scm_gc_ports_collected = 0;
}
static void
-gc_end_stats ()
+gc_end_stats (scm_t_sweep_statistics sweep_stats)
{
unsigned long t = scm_c_get_internal_run_time ();
+
scm_gc_time_taken += (t - t_before_gc);
+ /* Reset the number of cells swept/collected since the last full GC. */
+ scm_i_gc_sweep_stats_1 = scm_i_gc_sweep_stats;
+ scm_i_gc_sweep_stats.collected = scm_i_gc_sweep_stats.swept = 0;
+
+ gc_update_stats (sweep_stats);
+
+ scm_gc_cells_marked_acc += (double) scm_i_gc_sweep_stats.swept
+ - (double) scm_i_gc_sweep_stats.collected;
+ scm_gc_cells_swept_acc += (double) scm_i_gc_sweep_stats.swept;
+
++scm_gc_times;
}
{
SCM cell;
int did_gc = 0;
-
+ scm_t_sweep_statistics sweep_stats;
+
scm_i_scm_pthread_mutex_lock (&scm_i_sweep_mutex);
scm_gc_running_p = 1;
- *free_cells = scm_i_sweep_some_segments (freelist);
+ *free_cells = scm_i_sweep_some_segments (freelist, &sweep_stats);
+ gc_update_stats (sweep_stats);
+
if (*free_cells == SCM_EOL && scm_i_gc_grow_heap_p (freelist))
{
- freelist->heap_segment_idx = scm_i_get_new_heap_segment (freelist, abort_on_error);
- *free_cells = scm_i_sweep_some_segments (freelist);
+ freelist->heap_segment_idx =
+ scm_i_get_new_heap_segment (freelist,
+ scm_i_gc_sweep_stats,
+ abort_on_error);
+
+ *free_cells = scm_i_sweep_some_segments (freelist, &sweep_stats);
+ gc_update_stats (sweep_stats);
}
if (*free_cells == SCM_EOL)
with the advent of lazy sweep, GC yield is only known just
before doing the GC.
*/
- scm_i_adjust_min_yield (freelist);
+ scm_i_adjust_min_yield (freelist,
+ scm_i_gc_sweep_stats,
+ scm_i_gc_sweep_stats_1);
/*
out of fresh cells. Try to get some new ones.
did_gc = 1;
scm_i_gc ("cells");
- *free_cells = scm_i_sweep_some_segments (freelist);
+ *free_cells = scm_i_sweep_some_segments (freelist, &sweep_stats);
+ gc_update_stats (sweep_stats);
}
if (*free_cells == SCM_EOL)
/*
failed getting new cells. Get new juice or die.
*/
- freelist->heap_segment_idx = scm_i_get_new_heap_segment (freelist, abort_on_error);
- *free_cells = scm_i_sweep_some_segments (freelist);
+ freelist->heap_segment_idx =
+ scm_i_get_new_heap_segment (freelist,
+ scm_i_gc_sweep_stats,
+ abort_on_error);
+
+ *free_cells = scm_i_sweep_some_segments (freelist, &sweep_stats);
+ gc_update_stats (sweep_stats);
}
if (*free_cells == SCM_EOL)
void
scm_i_gc (const char *what)
{
+ scm_t_sweep_statistics sweep_stats;
+
scm_i_thread_put_to_sleep ();
scm_c_hook_run (&scm_before_gc_c_hook, 0);
Let's finish the sweep. The conservative GC might point into the
garbage, and marking that would create a mess.
*/
- scm_i_sweep_all_segments("GC");
+ scm_i_sweep_all_segments ("GC", &sweep_stats);
+
+ /* Invariant: the number of cells collected (i.e., freed) must always be
+ lower than or equal to the number of cells "swept" (i.e., visited). */
+ assert (sweep_stats.collected <= sweep_stats.swept);
+
if (scm_mallocated < scm_i_deprecated_memory_return)
{
/* The byte count of allocated objects has underflowed. This is
scm_gc_sweep ();
scm_c_hook_run (&scm_after_sweep_c_hook, 0);
- gc_end_stats ();
+ gc_end_stats (sweep_stats);
scm_i_thread_wake_up ();
*/
}
+
\f
/* {GC Protection Helper Functions}
*/
#endif
- scm_stand_in_procs = scm_c_make_hash_table (257);
+ scm_stand_in_procs = scm_make_weak_key_hash_table (scm_from_int (257));
scm_permobjs = SCM_EOL;
scm_protects = scm_c_make_hash_table (31);
scm_gc_registered_roots = scm_c_make_hash_table (31);
#include "libguile/gc.x"
}
+#ifdef __ia64__
+# ifdef __hpux
+# include <sys/param.h>
+# include <sys/pstat.h>
+void *
+scm_ia64_register_backing_store_base (void)
+{
+ struct pst_vm_status vm_status;
+ int i = 0;
+ while (pstat_getprocvm (&vm_status, sizeof (vm_status), 0, i++) == 1)
+ if (vm_status.pst_type == PS_RSESTACK)
+ return (void *) vm_status.pst_vaddr;
+ abort ();
+}
+void *
+scm_ia64_ar_bsp (const void *ctx)
+{
+ uint64_t bsp;
+ __uc_get_ar_bsp(ctx, &bsp);
+ return (void *) bsp;
+}
+# endif /* hpux */
+# ifdef linux
+# include <ucontext.h>
+void *
+scm_ia64_register_backing_store_base (void)
+{
+ extern void *__libc_ia64_register_backing_store_base;
+ return __libc_ia64_register_backing_store_base;
+}
+void *
+scm_ia64_ar_bsp (const void *opaque)
+{
+ ucontext_t *ctx = opaque;
+ return (void *) ctx->uc_mcontext.sc_ar_bsp;
+}
+# endif /* linux */
+#endif /* __ia64__ */
void
scm_gc_sweep (void)
HCoop / bpt / guile.git / blobdiff