Reorganize gray mark functions in GC.

matz · matz · commit 742117e7a385 · 2020-06-11T16:18:52.000+09:00
diff --git a/src/gc.c b/src/gc.c
@@ -960,13 +960,12 @@ root_scan_phase(mrb_state *mrb, mrb_gc *gc)
   }
 }
 
+/* rough estimation of number of GC marks (non recursive) */
 static size_t
-gc_gray_mark(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
+gc_gray_counts(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
 {
   size_t children = 0;
 
-  gc_mark_children(mrb, gc, obj);
-
   switch (obj->tt) {
   case MRB_TT_ICLASS:
     children++;
@@ -1064,7 +1063,9 @@ incremental_marking_phase(mrb_state *mrb, mrb_gc *gc, size_t limit)
   size_t tried_marks = 0;
 
   while (gc->gray_list && tried_marks < limit) {
-    tried_marks += gc_gray_mark(mrb, gc, gc->gray_list);
+    struct RBasic *obj = gc->gray_list;
+    gc_mark_children(mrb, gc, obj);
+    tried_marks += gc_gray_counts(mrb, gc, obj);
   }
 
   return tried_marks;

Original file line number	Diff line number	Diff line change
`@@ -960,13 +960,12 @@ root_scan_phase(mrb_state mrb, mrb_gc gc)`
`960`	`960`	`}`
`961`	`961`	`}`
`962`	`962`
	`963`	`+/* rough estimation of number of GC marks (non recursive) */`
`963`	`964`	`static size_t`
`964`		`-gc_gray_mark(mrb_state mrb, mrb_gc gc, struct RBasic *obj)`
	`965`	`+gc_gray_counts(mrb_state mrb, mrb_gc gc, struct RBasic *obj)`
`965`	`966`	`{`
`966`	`967`	`size_t children = 0;`
`967`	`968`
`968`		`- gc_mark_children(mrb, gc, obj);`
`969`		`-`
`970`	`969`	`switch (obj->tt) {`
`971`	`970`	`case MRB_TT_ICLASS:`
`972`	`971`	`children++;`
`@@ -1064,7 +1063,9 @@ incremental_marking_phase(mrb_state mrb, mrb_gc gc, size_t limit)`
`1064`	`1063`	`size_t tried_marks = 0;`
`1065`	`1064`
`1066`	`1065`	`while (gc->gray_list && tried_marks < limit) {`
`1067`		`- tried_marks += gc_gray_mark(mrb, gc, gc->gray_list);`
	`1066`	`+ struct RBasic *obj = gc->gray_list;`
	`1067`	`+ gc_mark_children(mrb, gc, obj);`
	`1068`	`+ tried_marks += gc_gray_counts(mrb, gc, obj);`
`1068`	`1069`	`}`
`1069`	`1070`
`1070`	`1071`	`return tried_marks;`