From: Han-Wen Nienhuys <hanwen@xs4all.nl>
To: guile-devel@gnu.org
Subject: [PATCH] Revise GC asserts.
Date: Wed, 10 Sep 2008 00:14:09 -0300 [thread overview]
Message-ID: <ga7e4l$oin$1@ger.gmane.org> (raw)
* libguile/gc.c (scm_i_gc): Change assert into deprecation warning.
* libguile/private-gc.h (nil): introduce scm_i_last_marked_cell_count,
as a private mechanism for maintaining cell counts. Previous
versions incremented scm_cells_allocated in an inlined function, so
loading dynamic objects of older GUILEs would break invariants.
---
libguile/gc.c | 18 +++++++++++++-----
libguile/private-gc.h | 5 +++--
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/libguile/gc.c b/libguile/gc.c
index f3ef585..0323f87 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -416,7 +416,7 @@ gc_end_stats ()
scm_gc_cells_allocated_acc +=
(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_swept_acc += (double) scm_i_gc_sweep_stats.swept;
@@ -558,6 +558,8 @@ scm_check_deprecated_memory_return ()
scm_i_deprecated_memory_return = 0;
}
+long int scm_i_last_marked_cell_count;
+
/* Must be called while holding scm_i_sweep_mutex.
This function is fairly long, but it touches various global
@@ -603,11 +605,17 @@ scm_i_gc (const char *what)
/* TODO(hanwen): figure out why the stats are off on x64_64. */
/* If this was not true, someone touched mark bits outside of the
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. "
+ "Are you marking objects outside of the mark phase?";
+ scm_c_issue_deprecation_warning(msg);
+ }
assert (scm_i_gc_sweep_stats.swept
== (scm_i_master_freelist.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);
#endif /* SCM_DEBUG_CELL_ACCESSES */
@@ -617,8 +625,8 @@ scm_i_gc (const char *what)
scm_mark_all ();
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
TODO: the after_sweep hook should probably be moved to just before
diff --git a/libguile/private-gc.h b/libguile/private-gc.h
index 93503ce..f5331ab 100644
--- a/libguile/private-gc.h
+++ b/libguile/private-gc.h
@@ -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 unsigned long *scm_i_segment_table_info(int *size);
-extern long int scm_i_deprecated_memory_return;
-extern long int scm_i_find_heap_calls;
+SCM_INTERNAL long int scm_i_deprecated_memory_return;
+SCM_INTERNAL long int scm_i_find_heap_calls;
+SCM_INTERNAL long int scm_i_last_marked_cell_count;
/*
global init funcs.
--
1.5.5.1
next reply other threads:[~2008-09-10 3:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-10 3:14 Han-Wen Nienhuys [this message]
2008-09-10 7:32 ` [PATCH] Revise GC asserts Ludovic Courtès
2008-09-11 6:21 ` Han-Wen Nienhuys
2008-09-11 10:28 ` Ludovic Courtès
2008-09-11 15:14 ` Han-Wen Nienhuys
2008-09-11 18:38 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='ga7e4l$oin$1@ger.gmane.org' \
--to=hanwen@xs4all.nl \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).