* gc.c (RGENGC_CHECK_MODE): separate checkers to different modes.

ko1 · ko1 · commit 14979f2161e2 · 2013-12-10T06:44:35.000Z
* 2: enable generational bits check (for debugging)
  * 3: enable livness check
  * 4: show all references



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 10 15:28:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RGENGC_CHECK_MODE): separate checkers to different modes.
+	  * 2: enable generational bits check (for debugging)
+	  * 3: enable livness check
+	  * 4: show all references
+
 Tue Dec 10 15:15:37 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (gc_marks_check): disable GC during checking and
diff --git a/gc.c b/gc.c
@@ -183,8 +183,9 @@ static ruby_gc_params_t gc_params = {
 /* RGENGC_CHECK_MODE
  * 0: disable all assertions
  * 1: enable assertions (to debug RGenGC)
- * 2: enable bits check (for debugging)
- * 3: show all references
+ * 2: enable generational bits check (for debugging)
+ * 3: enable livness check
+ * 4: show all references
  */
 #ifndef RGENGC_CHECK_MODE
 #define RGENGC_CHECK_MODE  0
@@ -4197,6 +4198,7 @@ reflist_dump(struct reflist *refs)
     }
 }
 
+#if RGENGC_CHECK_MODE >= 3
 static int
 reflist_refered_from_machine_context(struct reflist *refs)
 {
@@ -4207,6 +4209,7 @@ reflist_refered_from_machine_context(struct reflist *refs)
     }
     return 0;
 }
+#endif
 
 struct allrefs {
     rb_objspace_t *objspace;
@@ -4297,7 +4300,7 @@ objspace_allrefs_destruct(struct st_table *refs)
     st_free_table(refs);
 }
 
-#if RGENGC_CHECK_MODE >= 3
+#if RGENGC_CHECK_MODE >= 4
 static int
 allrefs_dump_i(st_data_t k, st_data_t v, st_data_t ptr)
 {
@@ -4337,9 +4340,11 @@ gc_check_before_marks_i(st_data_t k, st_data_t v, void *ptr)
 		/* parent is old */
 		if (!MARKED_IN_BITMAP(GET_HEAP_PAGE(parent)->rememberset_bits, parent) &&
 		    !MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->rememberset_bits, obj)) {
-		    fprintf(stderr, "gc_marks_check_i: WB miss %p (%s) -> %p (%s)\n",
+		    fprintf(stderr, "gc_marks_check_i: WB miss %p (%s) -> %p (%s) ",
 			    (void *)parent, obj_type_name(parent),
 			    (void *)obj, obj_type_name(obj));
+		    reflist_dump(refs);
+		    fprintf(stderr, "\n");
 		    objspace->rgengc.error_count++;
 		}
 	    }
@@ -4348,6 +4353,7 @@ gc_check_before_marks_i(st_data_t k, st_data_t v, void *ptr)
     return ST_CONTINUE;
 }
 
+#if RGENGC_CHECK_MODE >= 3
 static int
 gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
 {
@@ -4372,6 +4378,7 @@ gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
     }
     return ST_CONTINUE;
 }
+#endif
 
 static void
 gc_marks_check(rb_objspace_t *objspace, int (*checker_func)(ANYARGS), const char *checker_name)
@@ -4387,7 +4394,7 @@ gc_marks_check(rb_objspace_t *objspace, int (*checker_func)(ANYARGS), const char
     st_foreach(objspace->rgengc.allrefs_table, checker_func, (st_data_t)objspace);
 
     if (objspace->rgengc.error_count > 0) {
-#if RGENGC_CHECK_MODE >= 3
+#if RGENGC_CHECK_MODE >= 4
 	allrefs_dump(objspace);
 #endif
 	rb_bug("%s: GC has problem.", checker_name);
@@ -4445,7 +4452,7 @@ gc_marks(rb_objspace_t *objspace, int full_mark)
 	}
 #endif
 
-#if RGENGC_CHECK_MODE >= 2
+#if RGENGC_CHECK_MODE >= 3
 	gc_marks_check(objspace, gc_check_after_marks_i, "after_marks");
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,9 @@ static ruby_gc_params_t gc_params = {`
`183`	`183`	`/* RGENGC_CHECK_MODE`
`184`	`184`	`* 0: disable all assertions`
`185`	`185`	`* 1: enable assertions (to debug RGenGC)`
`186`		`- * 2: enable bits check (for debugging)`
`187`		`- * 3: show all references`
	`186`	`+ * 2: enable generational bits check (for debugging)`
	`187`	`+ * 3: enable livness check`
	`188`	`+ * 4: show all references`
`188`	`189`	`*/`
`189`	`190`	`#ifndef RGENGC_CHECK_MODE`
`190`	`191`	`#define RGENGC_CHECK_MODE 0`
`@@ -4197,6 +4198,7 @@ reflist_dump(struct reflist *refs)`
`4197`	`4198`	`}`
`4198`	`4199`	`}`
`4199`	`4200`
	`4201`	`+#if RGENGC_CHECK_MODE >= 3`
`4200`	`4202`	`static int`
`4201`	`4203`	`reflist_refered_from_machine_context(struct reflist *refs)`
`4202`	`4204`	`{`
`@@ -4207,6 +4209,7 @@ reflist_refered_from_machine_context(struct reflist *refs)`
`4207`	`4209`	`}`
`4208`	`4210`	`return 0;`
`4209`	`4211`	`}`
	`4212`	`+#endif`
`4210`	`4213`
`4211`	`4214`	`struct allrefs {`
`4212`	`4215`	`rb_objspace_t *objspace;`
`@@ -4297,7 +4300,7 @@ objspace_allrefs_destruct(struct st_table *refs)`
`4297`	`4300`	`st_free_table(refs);`
`4298`	`4301`	`}`
`4299`	`4302`
`4300`		`-#if RGENGC_CHECK_MODE >= 3`
	`4303`	`+#if RGENGC_CHECK_MODE >= 4`
`4301`	`4304`	`static int`
`4302`	`4305`	`allrefs_dump_i(st_data_t k, st_data_t v, st_data_t ptr)`
`4303`	`4306`	`{`
`@@ -4337,9 +4340,11 @@ gc_check_before_marks_i(st_data_t k, st_data_t v, void *ptr)`
`4337`	`4340`	`/* parent is old */`
`4338`	`4341`	`if (!MARKED_IN_BITMAP(GET_HEAP_PAGE(parent)->rememberset_bits, parent) &&`
`4339`	`4342`	`!MARKED_IN_BITMAP(GET_HEAP_PAGE(obj)->rememberset_bits, obj)) {`
`4340`		`- fprintf(stderr, "gc_marks_check_i: WB miss %p (%s) -> %p (%s)\n",`
	`4343`	`+ fprintf(stderr, "gc_marks_check_i: WB miss %p (%s) -> %p (%s) ",`
`4341`	`4344`	`(void *)parent, obj_type_name(parent),`
`4342`	`4345`	`(void *)obj, obj_type_name(obj));`
	`4346`	`+ reflist_dump(refs);`
	`4347`	`+ fprintf(stderr, "\n");`
`4343`	`4348`	`objspace->rgengc.error_count++;`
`4344`	`4349`	`}`
`4345`	`4350`	`}`
`@@ -4348,6 +4353,7 @@ gc_check_before_marks_i(st_data_t k, st_data_t v, void *ptr)`
`4348`	`4353`	`return ST_CONTINUE;`
`4349`	`4354`	`}`
`4350`	`4355`
	`4356`	`+#if RGENGC_CHECK_MODE >= 3`
`4351`	`4357`	`static int`
`4352`	`4358`	`gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)`
`4353`	`4359`	`{`
`@@ -4372,6 +4378,7 @@ gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)`
`4372`	`4378`	`}`
`4373`	`4379`	`return ST_CONTINUE;`
`4374`	`4380`	`}`
	`4381`	`+#endif`
`4375`	`4382`
`4376`	`4383`	`static void`
`4377`	`4384`	`gc_marks_check(rb_objspace_t objspace, int (checker_func)(ANYARGS), const char *checker_name)`
`@@ -4387,7 +4394,7 @@ gc_marks_check(rb_objspace_t objspace, int (checker_func)(ANYARGS), const char`
`4387`	`4394`	`st_foreach(objspace->rgengc.allrefs_table, checker_func, (st_data_t)objspace);`
`4388`	`4395`
`4389`	`4396`	`if (objspace->rgengc.error_count > 0) {`
`4390`		`-#if RGENGC_CHECK_MODE >= 3`
	`4397`	`+#if RGENGC_CHECK_MODE >= 4`
`4391`	`4398`	`allrefs_dump(objspace);`
`4392`	`4399`	`#endif`
`4393`	`4400`	`rb_bug("%s: GC has problem.", checker_name);`
`@@ -4445,7 +4452,7 @@ gc_marks(rb_objspace_t *objspace, int full_mark)`
`4445`	`4452`	`}`
`4446`	`4453`	`#endif`
`4447`	`4454`
`4448`		`-#if RGENGC_CHECK_MODE >= 2`
	`4455`	`+#if RGENGC_CHECK_MODE >= 3`
`4449`	`4456`	`gc_marks_check(objspace, gc_check_after_marks_i, "after_marks");`
`4450`	`4457`	`#endif`
`4451`	`4458`