From 54d04073d77fc65844fd9062cc90dd8a3c079de5 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 18 Jun 2013 22:12:39 +0000 Subject: * gc.c (rgengc_remember): fix output level. * gc.c (rgengc_rememberset_mark): fix to output clear count. (shady_object_count + clear_count = count of remembered objects) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ gc.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ffc06ebea..d072d74c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 19 07:09:26 2013 Koichi Sasada + + * gc.c (rgengc_remember): fix output level. + + * gc.c (rgengc_rememberset_mark): fix to output clear count. + (shady_object_count + clear_count = count of remembered objects) + Wed Jun 19 07:06:21 2013 Koichi Sasada * gc.c (rgengc_remember): check T_NONE and T_ZOMBIE diff --git a/gc.c b/gc.c index 2b26037704..5ea9ec7a60 100644 --- a/gc.c +++ b/gc.c @@ -3628,7 +3628,7 @@ rgengc_remembersetbits_set(rb_objspace_t *objspace, VALUE obj) static void rgengc_remember(rb_objspace_t *objspace, VALUE obj) { - rgengc_report(0, objspace, "rgengc_remember: %p (%s, %s) %s\n", (void *)obj, obj_type_name(obj), + rgengc_report(2, objspace, "rgengc_remember: %p (%s, %s) %s\n", (void *)obj, obj_type_name(obj), RVALUE_SHADY(obj) ? "shady" : "non-shady", rgengc_remembersetbits_get(objspace, obj) ? "was already remembered" : "is remembered now"); @@ -3677,7 +3677,7 @@ static size_t rgengc_rememberset_mark(rb_objspace_t *objspace) { size_t i, j; - size_t shady_object_count = 0; + size_t shady_object_count = 0, clear_count = 0; RVALUE *p, *offset; uintptr_t *bits, bitset; @@ -3700,6 +3700,7 @@ rgengc_rememberset_mark(rb_objspace_t *objspace) if (!RVALUE_SHADY(p)) { rgengc_report(2, objspace, "rgengc_rememberset_mark: clear %p (%s)\n", p, obj_type_name((VALUE)p)); CLEAR_IN_BITMAP(bits, p); + clear_count++; } else { shady_object_count++; @@ -3712,7 +3713,7 @@ rgengc_rememberset_mark(rb_objspace_t *objspace) } } - rgengc_report(2, objspace, "rgengc_rememberset_mark: mark_cnt: %"PRIdSIZE", shady_object_count: %"PRIdSIZE"\n", shady_object_count); + rgengc_report(2, objspace, "rgengc_rememberset_mark: clear_count: %"PRIdSIZE", shady_object_count: %"PRIdSIZE"\n", clear_count, shady_object_count); return shady_object_count; } -- cgit v1.2.3