1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
ko1 2013-06-19 20:49:28 +00:00
parent 6622ab2049
commit efc53c496e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jun 20 05:47:41 2013 Koichi Sasada <ko1@atdot.net>
* 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@atdot.net> Thu Jun 20 05:38:56 2013 Koichi Sasada <ko1@atdot.net>
* gc.c: Accumulate sweep time to GC time. * gc.c: Accumulate sweep time to GC time.

9
gc.c
View File

@ -145,7 +145,7 @@ void rb_gcdebug_print_obj_condition(VALUE obj);
#endif #endif
#ifndef GC_PROFILE_MORE_DETAIL #ifndef GC_PROFILE_MORE_DETAIL
#define GC_PROFILE_MORE_DETAIL 1 #define GC_PROFILE_MORE_DETAIL 0
#endif #endif
#ifndef GC_ENABLE_LAZY_SWEEP #ifndef GC_ENABLE_LAZY_SWEEP
#define GC_ENABLE_LAZY_SWEEP 1 #define GC_ENABLE_LAZY_SWEEP 1
@ -355,9 +355,8 @@ typedef struct rb_objspace {
#endif /* RGENGC_PROFILE */ #endif /* RGENGC_PROFILE */
#endif /* USE_RGENGC */ #endif /* USE_RGENGC */
#if GC_PROFILE_MORE_DETAIL /* temporary profiling space */
double gc_sweep_start_time; /* temporary profiling space */ double gc_sweep_start_time;
#endif
} profile; } profile;
struct gc_list *global_list; struct gc_list *global_list;
size_t count; size_t count;
@ -5046,6 +5045,8 @@ gc_prof_sweep_timer_start(rb_objspace_t *objspace)
RUBY_DTRACE_GC_SWEEP_BEGIN(); RUBY_DTRACE_GC_SWEEP_BEGIN();
} }
if (objspace->profile.run) { if (objspace->profile.run) {
gc_profile_record *record = gc_prof_record(objspace);
if (record->gc_time > 0 || GC_PROFILE_MORE_DETAIL) { if (record->gc_time > 0 || GC_PROFILE_MORE_DETAIL) {
objspace->profile.gc_sweep_start_time = getrusage_time(); objspace->profile.gc_sweep_start_time = getrusage_time();
} }