* gc.c (gc_prof_sweep_timer_start): fix merge miss.

* gc.c (GC_PROFILE_MORE_DETAIL): set it 0.



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

1 files changed, 5 insertions, 4 deletions

diff --git a/gc.c b/gc.c
index 9f5e569b60..7eb6114867 100644
--- a/gc.c
+++ b/gc.c
@@ -145,7 +145,7 @@ void rb_gcdebug_print_obj_condition(VALUE obj);
 #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 {
 #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 *objspace)
 	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();
 	}