* gc.c: remove rb_objspace_t::marked_num.

  We can use `objspace_live_num()' instead of removed `marked_num'
  if it is after `after_gc_sweep()' function call.
* gc.c (after_gc_sweep): use objspace_live_num() instead of removed
  rb_objspace_t::marked_num.
* gc.c (gc_mark_ptr, gc_marks): remove rb_objspace_t::marked_num code.
* gc.c (gc_prepare_free_objects): do not call set_heaps_increment()
  with checking objspace->heap.marked_num. At this point, we only
  need to check availability of free-cell.
* gc.c (gc_prepare_free_objects):
* gc.c (lazy_sweep): call after_gc_sweep() if there are no sweep_able entry.
* gc.c (rest_sweep, gc_prepare_free_objects): remove after_gc_sweep() call.



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

2 files changed, 32 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b63c50f52..dfab373770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Tue May 14 01:54:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove rb_objspace_t::marked_num.
+	  We can use `objspace_live_num()' instead of removed `marked_num'
+	  if it is after `after_gc_sweep()' function call.
+
+	* gc.c (after_gc_sweep): use objspace_live_num() instead of removed
+	  rb_objspace_t::marked_num.
+
+	* gc.c (gc_mark_ptr, gc_marks): remove rb_objspace_t::marked_num code.
+
+	* gc.c (gc_prepare_free_objects): do not call set_heaps_increment()
+	  with checking objspace->heap.marked_num. At this point, we only
+	  need to check availability of free-cell.
+
+	* gc.c (gc_prepare_free_objects): 
+
+	* gc.c (lazy_sweep): call after_gc_sweep() if there are no sweep_able entry.
+
+	* gc.c (rest_sweep, gc_prepare_free_objects): remove after_gc_sweep() call.
+
 Tue May 14 01:50:41 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c: disable GC_PROFILE_MORE_DETAIL (fix last commit).
diff --git a/gc.c b/gc.c
index fd9b9a44cc..cf02d333b5 100644
--- a/gc.c
+++ b/gc.c
@@ -231,7 +231,6 @@ typedef struct rb_objspace {
         struct heaps_free_bitmap *free_bitmap;
 	RVALUE *range[2];
 	struct heaps_header *freed;
-	size_t marked_num;
 	size_t free_num;
 	size_t free_min;
 	size_t final_num;
@@ -2011,7 +2010,7 @@ after_gc_sweep(rb_objspace_t *objspace)
     inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0);
     if (inc > malloc_limit) {
 	malloc_limit +=
-	  (size_t)((inc - malloc_limit) * (double)objspace->heap.marked_num / (heaps_used * HEAP_OBJ_LIMIT));
+	  (size_t)((inc - malloc_limit) * (double)objspace_live_num(objspace) / (heaps_used * HEAP_OBJ_LIMIT));
 	if (malloc_limit < initial_malloc_limit) malloc_limit = initial_malloc_limit;
     }
 
@@ -2028,6 +2027,9 @@ lazy_sweep(rb_objspace_t *objspace)
         next = objspace->heap.sweep_slots->next;
 	slot_sweep(objspace, objspace->heap.sweep_slots);
         objspace->heap.sweep_slots = next;
+
+	if (!next) after_gc_sweep(objspace);
+
         if (has_free_object) {
             during_gc = 0;
             return TRUE;
@@ -2043,7 +2045,6 @@ rest_sweep(rb_objspace_t *objspace)
 	while (objspace->heap.sweep_slots) {
 	    lazy_sweep(objspace);
 	}
-	after_gc_sweep(objspace);
     }
 }
 
@@ -2076,7 +2077,6 @@ gc_prepare_free_objects(rb_objspace_t *objspace)
             gc_prof_timer_stop(objspace, Qfalse);
             return res;
         }
-        after_gc_sweep(objspace);
     }
     else {
         if (heaps_increment(objspace)) {
@@ -2088,15 +2088,18 @@ gc_prepare_free_objects(rb_objspace_t *objspace)
     gc_marks(objspace);
 
     before_gc_sweep(objspace);
-    if (objspace->heap.free_min > (heaps_used * HEAP_OBJ_LIMIT - objspace->heap.marked_num)) {
-	set_heaps_increment(objspace);
-    }
 
     if (!(res = lazy_sweep(objspace))) {
-        after_gc_sweep(objspace);
+	/* there is no freespace after slot_sweep() */
+	while (1) {
+	    set_heaps_increment(objspace);
+	    heaps_increment(objspace);
+
         if (has_free_object) {
             res = TRUE;
             during_gc = 0;
+		break;
+	    }
         }
     }
 
@@ -2574,7 +2577,6 @@ gc_mark_ptr(rb_objspace_t *objspace, VALUE ptr)
     register uintptr_t *bits = GET_HEAP_BITMAP(ptr);
     if (MARKED_IN_BITMAP(bits, ptr)) return 0;
     MARK_IN_BITMAP(bits, ptr);
-    objspace->heap.marked_num++;
     return 1;
 }
 
@@ -2935,7 +2937,6 @@ gc_marks(rb_objspace_t *objspace)
     objspace->mark_func_data = 0;
 
     gc_prof_mark_timer_start(objspace);
-    objspace->heap.marked_num = 0;
     objspace->count++;
 
     SET_STACK_END;