* gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages()

  from gc_sweep().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bcffeeaca0..dfccc8f464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 15 18:57:23 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages()
+	  from gc_sweep().
+
 Thu May 15 18:51:25 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (heap_extend_pages): calculate next growing heap size.
diff --git a/gc.c b/gc.c
index ec6c13dabf..9c6865686f 100644
--- a/gc.c
+++ b/gc.c
@@ -3124,8 +3124,6 @@ gc_sweep(rb_objspace_t *objspace, int immediate_sweep)
 	}
 	gc_heap_lazy_sweep(objspace, heap_eden);
     }
-
-    gc_heap_prepare_minimum_pages(objspace, heap_eden);
 }
 
 /* Marking - Marking stack */
@@ -5102,6 +5100,8 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep
     }
     gc_prof_timer_stop(objspace);
 
+    gc_heap_prepare_minimum_pages(objspace, heap_eden);
+
     if (GC_NOTIFY) fprintf(stderr, "end garbage_collect()\n");
     return TRUE;
 }