From 03e6d4eadbe402422505e1a0e0167de1f050c212 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 6 Apr 2013 17:57:48 +0000 Subject: merge revision(s) 39812: [Backport #8147] * gc.c: Improve accuracy of objspace_live_num() and allocated/freed counters. patched by tmm1(Aman Gupta). [Bug #8092] [ruby-core:53392] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index ace7a0882a..4831669dc7 100644 --- a/gc.c +++ b/gc.c @@ -1426,12 +1426,10 @@ finalize_list(rb_objspace_t *objspace, RVALUE *p) while (p) { RVALUE *tmp = p->as.free.next; run_final(objspace, (VALUE)p); + objspace->total_freed_object_num++; if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */ add_slot_local_freelist(objspace, p); - if (!is_lazy_sweeping(objspace)) { - objspace->total_freed_object_num++; - objspace->heap.free_num++; - } + objspace->heap.free_num++; } else { struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark; @@ -1935,9 +1933,9 @@ slot_sweep(rb_objspace_t *objspace, struct heaps_slot *sweep_slot) else { sweep_slot->free_next = NULL; } - objspace->total_freed_object_num += freed_num; objspace->heap.free_num += freed_num + empty_num; } + objspace->total_freed_object_num += freed_num; objspace->heap.final_num += final_num; if (deferred_final_list && !finalizing) { @@ -2961,11 +2959,11 @@ rb_gc_force_recycle(VALUE p) rb_objspace_t *objspace = &rb_objspace; struct heaps_slot *slot; + objspace->total_freed_object_num++; if (MARKED_IN_BITMAP(GET_HEAP_BITMAP(p), p)) { add_slot_local_freelist(objspace, (RVALUE *)p); } else { - objspace->total_freed_object_num++; objspace->heap.free_num++; slot = add_slot_local_freelist(objspace, (RVALUE *)p); if (slot->free_next == NULL) { -- cgit v1.2.3