ko1	2015-04-24 05:40:19 +0900 (Fri, 24 Apr 2015)

  New Revision: 50376

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50376

  Log:
    * gc.c (gc_mark_roots): fox to work PRINT_ROOT_TICKS.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50375)
+++ ChangeLog	(revision 50376)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Apr 24 05:38:01 2015  Koichi Sasada  <ko1@a...>
+
+	* gc.c (gc_mark_roots): fox to work PRINT_ROOT_TICKS.
+
 Fri Apr 24 04:49:05 2015  NARUSE, Yui  <naruse@r...>
 
 	* win32/Makefile.sub: MSVC14 have struct timespec.
Index: gc.c
===================================================================
--- gc.c	(revision 50375)
+++ gc.c	(revision 50376)
@@ -154,7 +154,7 @@ rb_gc_guarded_ptr_val(volatile VALUE *pt https://github.com/ruby/ruby/blob/trunk/gc.c#L154
 #define PRINT_ROOT_TICKS 0
 #endif
 
-#define USE_TICK_T                 (PRINT_ENTER_EXIT_TICK || PRINT_MEASURE_LINE)
+#define USE_TICK_T                 (PRINT_ENTER_EXIT_TICK || PRINT_MEASURE_LINE || PRINT_ROOT_TICKS)
 #define TICK_TYPE 1
 
 typedef struct {
@@ -4471,11 +4471,6 @@ gc_mark_roots(rb_objspace_t *objspace, c https://github.com/ruby/ruby/blob/trunk/gc.c#L4471
 {
     struct gc_list *list;
     rb_thread_t *th = GET_THREAD();
-    if (categoryp) *categoryp = "xxx";
-
-#if USE_RGENGC
-    objspace->rgengc.parent_object = Qfalse;
-#endif
 
 #if PRINT_ROOT_TICKS
     tick_t start_tick = tick();
@@ -4487,6 +4482,12 @@ gc_mark_roots(rb_objspace_t *objspace, c https://github.com/ruby/ruby/blob/trunk/gc.c#L4482
     }
 #endif
 
+    if (categoryp) *categoryp = "xxx";
+
+#if USE_RGENGC
+    objspace->rgengc.parent_object = Qfalse;
+#endif
+
 #if PRINT_ROOT_TICKS
 #define MARK_CHECKPOINT_PRINT_TICK(category) do { \
     if (prev_category) { \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/