summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 04:19:21 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 04:19:21 +0000
commite7d8c473c17540dbc0b360efd689fbd2def69967 (patch)
treea641a587ea9d4d7eacbcdb84811b4e8896050e70
parenta0bbf948b52437f0a8becf23fc8fbbddc0d0dda8 (diff)
* gc.c (objspace_live_slot): live slot count should not include final
slot (contains T_ZOMBIE) count. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f74db4b8f5..52035b900f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 3 13:18:24 2014 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (objspace_live_slot): live slot count should not include final
+ slot (contains T_ZOMBIE) count.
+
Tue Jun 3 13:03:21 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (obj_free): fix spacing.
diff --git a/gc.c b/gc.c
index 3b0becadf83..30938e1563c 100644
--- a/gc.c
+++ b/gc.c
@@ -2743,7 +2743,7 @@ lazy_sweep_enable(void)
static size_t
objspace_live_slot(rb_objspace_t *objspace)
{
- return objspace->profile.total_allocated_object_num - objspace->profile.total_freed_object_num;
+ return objspace->profile.total_allocated_object_num - objspace->profile.total_freed_object_num - heap_pages_final_slots;
}
static size_t