ko1	2013-06-20 05:49:28 +0900 (Thu, 20 Jun 2013)

  New Revision: 41454

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

  Log:
    * gc.c (gc_prof_sweep_timer_start): fix merge miss.
    * gc.c (GC_PROFILE_MORE_DETAIL): set it 0.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41453)
+++ ChangeLog	(revision 41454)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jun 20 05:47:41 2013  Koichi Sasada  <ko1@a...>
+
+	* gc.c (gc_prof_sweep_timer_start): fix merge miss.
+
+	* gc.c (GC_PROFILE_MORE_DETAIL): set it 0.
+
 Thu Jun 20 05:38:56 2013  Koichi Sasada  <ko1@a...>
 
 	* gc.c: Accumulate sweep time to GC time.
Index: gc.c
===================================================================
--- gc.c	(revision 41453)
+++ gc.c	(revision 41454)
@@ -145,7 +145,7 @@ void rb_gcdebug_print_obj_condition(VALU https://github.com/ruby/ruby/blob/trunk/gc.c#L145
 #endif
 
 #ifndef GC_PROFILE_MORE_DETAIL
-#define GC_PROFILE_MORE_DETAIL 1
+#define GC_PROFILE_MORE_DETAIL 0
 #endif
 #ifndef GC_ENABLE_LAZY_SWEEP
 #define GC_ENABLE_LAZY_SWEEP 1
@@ -355,9 +355,8 @@ typedef struct rb_objspace { https://github.com/ruby/ruby/blob/trunk/gc.c#L355
 #endif /* RGENGC_PROFILE */
 #endif /* USE_RGENGC */
 
-#if GC_PROFILE_MORE_DETAIL
-	double gc_sweep_start_time; /* temporary profiling space */
-#endif
+	/* temporary profiling space */
+	double gc_sweep_start_time;
     } profile;
     struct gc_list *global_list;
     size_t count;
@@ -5046,6 +5045,8 @@ gc_prof_sweep_timer_start(rb_objspace_t https://github.com/ruby/ruby/blob/trunk/gc.c#L5045
 	RUBY_DTRACE_GC_SWEEP_BEGIN();
     }
     if (objspace->profile.run) {
+	gc_profile_record *record = gc_prof_record(objspace);
+
 	if (record->gc_time > 0 || GC_PROFILE_MORE_DETAIL) {
 	    objspace->profile.gc_sweep_start_time = getrusage_time();
 	}

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