From e8ee0a24dcd858178cf7016a9169ffe79f1c25ea Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 16 Jul 2013 07:33:48 +0000 Subject: * gc.c (lazy_sweep): refactoring. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bae51f5a09..1248d62c51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 16 16:30:58 2013 Koichi Sasada + + * gc.c (lazy_sweep): refactoring. + Tue Jul 16 13:32:06 2013 Nobuyoshi Nakada * encoding.c (enc_set_index): since r41967, old terminator is dealt diff --git a/gc.c b/gc.c index 108f1f4d28..6b1c9ac6a5 100644 --- a/gc.c +++ b/gc.c @@ -2384,16 +2384,19 @@ after_gc_sweep(rb_objspace_t *objspace) static int lazy_sweep(rb_objspace_t *objspace) { - struct heaps_slot *next; + struct heaps_slot *slot, *next; int result = FALSE; gc_prof_sweep_timer_start(objspace); heaps_increment(objspace); - while (is_lazy_sweeping(objspace)) { - next = objspace->heap.sweep_slots->next; - slot_sweep(objspace, objspace->heap.sweep_slots); - objspace->heap.sweep_slots = next; + + slot = objspace->heap.sweep_slots; + + while (slot) { + objspace->heap.sweep_slots = next = slot->next; + + slot_sweep(objspace, slot); if (!next) after_gc_sweep(objspace); @@ -2401,6 +2404,8 @@ lazy_sweep(rb_objspace_t *objspace) result = TRUE; break; } + + slot = next; } gc_prof_sweep_timer_stop(objspace); -- cgit v1.2.3