From d4f375b48bc1701547dd53f0928cf920f1bfd0e5 Mon Sep 17 00:00:00 2001
From: fleuria <me.ssword@gmail.com>
Date: Fri, 19 Jul 2013 12:01:34 +0800
Subject: rename advance_phase to incremental_gc_until

in fact advance_phace() is not really a "phase", but can be used
as an utility function.
---
 src/gc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/gc.c b/src/gc.c
index a22ef1adf..a11f86007 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -891,7 +891,7 @@ incremental_gc(mrb_state *mrb, size_t limit)
 }
 
 static void
-advance_phase(mrb_state *mrb, enum gc_state to_state)
+incremental_gc_until(mrb_state *mrb, enum gc_state to_state)
 {
   while (mrb->gc_state != to_state) {
     incremental_gc(mrb, ~0);
@@ -905,12 +905,12 @@ clear_all_old(mrb_state *mrb)
 
   gc_assert(is_generational(mrb));
   if (is_major_gc(mrb)) {
-    advance_phase(mrb, GC_STATE_NONE);
+    incremental_gc_until(mrb, GC_STATE_NONE);
   }
 
   mrb->is_generational_gc_mode = FALSE;
   prepare_incremental_sweep(mrb);
-  advance_phase(mrb, GC_STATE_NONE);
+  incremental_gc_until(mrb, GC_STATE_NONE);
   mrb->variable_gray_list = mrb->gray_list = NULL;
   mrb->is_generational_gc_mode = origin_mode;
 }
@@ -1190,7 +1190,7 @@ change_gen_gc_mode(mrb_state *mrb, mrb_int enable)
     mrb->gc_full = FALSE;
   }
   else if (!is_generational(mrb) && enable) {
-    advance_phase(mrb, GC_STATE_NONE);
+    incremental_gc_until(mrb, GC_STATE_NONE);
     mrb->majorgc_old_threshold = mrb->gc_live_after_mark/100 * DEFAULT_MAJOR_GC_INC_RATIO;
     mrb->gc_full = FALSE;
   }
@@ -1444,7 +1444,7 @@ test_incremental_gc(void)
   incremental_gc(mrb, max);
   gc_assert(mrb->gc_state == GC_STATE_MARK);
   puts("  in GC_STATE_MARK");
-  advance_phase(mrb, GC_STATE_SWEEP);
+  incremental_gc_until(mrb, GC_STATE_SWEEP);
   gc_assert(mrb->gc_state == GC_STATE_SWEEP);
 
   puts("  in GC_STATE_SWEEP");
@@ -1483,7 +1483,7 @@ test_incremental_gc(void)
   gc_assert(mrb->live == total-freed);
 
   puts("test_incremental_gc(gen)");
-  advance_phase(mrb, GC_STATE_SWEEP);
+  incremental_gc_until(mrb, GC_STATE_SWEEP);
   change_gen_gc_mode(mrb, TRUE);
 
   gc_assert(mrb->gc_full == FALSE);
-- 
cgit v1.2.3


From c49e2d766eb2ad06ce10dea6e0df436099795fbe Mon Sep 17 00:00:00 2001
From: fleuria <me.ssword@gmail.com>
Date: Fri, 19 Jul 2013 12:09:21 +0800
Subject: cleanup redundant codes with incremental_gc_until()

---
 src/gc.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/gc.c b/src/gc.c
index a11f86007..02ef459d8 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -893,9 +893,9 @@ incremental_gc(mrb_state *mrb, size_t limit)
 static void
 incremental_gc_until(mrb_state *mrb, enum gc_state to_state)
 {
-  while (mrb->gc_state != to_state) {
+  do {
     incremental_gc(mrb, ~0);
-  }
+  } while (mrb->gc_state != to_state);
 }
 
 static void
@@ -924,9 +924,7 @@ mrb_incremental_gc(mrb_state *mrb)
   GC_TIME_START;
 
   if (is_minor_gc(mrb)) {
-    do {
-      incremental_gc(mrb, ~0);
-    } while (mrb->gc_state != GC_STATE_NONE);
+    incremental_gc_until(mrb, GC_STATE_NONE);
   }
   else {
     size_t limit = 0, result = 0;
@@ -966,17 +964,13 @@ mrb_incremental_gc(mrb_state *mrb)
 void
 mrb_garbage_collect(mrb_state *mrb)
 {
-  size_t max_limit = ~0;
-
   if (mrb->gc_disabled) return;
   GC_INVOKE_TIME_REPORT("mrb_garbage_collect()");
   GC_TIME_START;
 
   if (mrb->gc_state == GC_STATE_SWEEP) {
     /* finish sweep phase */
-    while (mrb->gc_state != GC_STATE_NONE) {
-      incremental_gc(mrb, max_limit);
-    }
+    incremental_gc_until(mrb, GC_STATE_NONE);
   }
 
   /* clean all black object as old */
@@ -985,10 +979,7 @@ mrb_garbage_collect(mrb_state *mrb)
     mrb->gc_full = TRUE;
   }
 
-  do {
-    incremental_gc(mrb, max_limit);
-  } while (mrb->gc_state != GC_STATE_NONE);
-
+  incremental_gc_until(mrb, GC_STATE_NONE);
   mrb->gc_threshold = (mrb->gc_live_after_mark/100) * mrb->gc_interval_ratio;
 
   if (is_generational(mrb)) {
-- 
cgit v1.2.3