kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

revert last commit (operation miss).

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-06-21 06:04:29 +00:00
parent 8398719020
commit dfc4cc0196
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gc.c
View file

@ -126,7 +126,7 @@ void rb_gcdebug_print_obj_condition(VALUE obj);
* 3: show all references * 3: show all references
*/ */
#ifndef RGENGC_CHECK_MODE #ifndef RGENGC_CHECK_MODE
#define RGENGC_CHECK_MODE 2 #define RGENGC_CHECK_MODE 0
#endif #endif
/* RGENGC_PROFILE /* RGENGC_PROFILE
@ -135,7 +135,7 @@ void rb_gcdebug_print_obj_condition(VALUE obj);
* 2: enable profiling for each types * 2: enable profiling for each types
*/ */
#ifndef RGENGC_PROFILE #ifndef RGENGC_PROFILE
#define RGENGC_PROFILE 1 #define RGENGC_PROFILE 0
#endif #endif
#else /* USE_RGENGC */ #else /* USE_RGENGC */
@ -145,10 +145,10 @@ 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 0
#endif #endif
#ifndef CALC_EXACT_MALLOC_SIZE #ifndef CALC_EXACT_MALLOC_SIZE
#define CALC_EXACT_MALLOC_SIZE 0 #define CALC_EXACT_MALLOC_SIZE 0
@ -3553,19 +3553,12 @@ gc_marks_test(rb_objspace_t *objspace, bits_t *before_stored_bitmaps)
{ {
bits_t *stored_bitmaps = gc_store_bitmaps(objspace); bits_t *stored_bitmaps = gc_store_bitmaps(objspace);
size_t i; size_t i;
size_t stored_oldgen, stored_shady;
rgengc_report(1, objspace, "gc_marks_test: test-full-gc\n"); rgengc_report(1, objspace, "gc_marks_test: test-full-gc\n");
/* run major (full) gc with temporary mark/rememberset */ /* run major (full) gc with temporary mark/rememberset */
stored_oldgen = objspace->rgengc.oldgen_object_count;
stored_shady = objspace->rgengc.remembered_shady_object_count;
{
gc_marks_body(objspace, FALSE); gc_marks_body(objspace, FALSE);
}
objspace->rgengc.during_minor_gc = TRUE; objspace->rgengc.during_minor_gc = TRUE;
objspace->rgengc.oldgen_object_count = stored_oldgen;
objspace->rgengc.remembered_shady_object_count = stored_shady;
/* check */ /* check */
for (i=0; i<heaps_used; i++) { for (i=0; i<heaps_used; i++) {
@ -5068,14 +5061,12 @@ gc_prof_sweep_timer_start(rb_objspace_t *objspace)
static inline void static inline void
gc_prof_sweep_timer_stop(rb_objspace_t *objspace) gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
{ {
fprintf(stderr, "gc_prof_sweep_timer_stop!!\n");
if (RUBY_DTRACE_GC_SWEEP_END_ENABLED()) { if (RUBY_DTRACE_GC_SWEEP_END_ENABLED()) {
RUBY_DTRACE_GC_SWEEP_END(); RUBY_DTRACE_GC_SWEEP_END();
} }
if (objspace->profile.run) { if (objspace->profile.run) {
double sweep_time; double sweep_time;
gc_profile_record *record = gc_prof_record(objspace); gc_profile_record *record = gc_prof_record(objspace);
if (record->gc_time > 0) { if (record->gc_time > 0) {
@ -5087,8 +5078,6 @@ gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time); sweep_time = elapsed_time_from(objspace->profile.gc_sweep_start_time);
} }
fprintf(stderr, "sweep_time: %g\n", sweep_time);
#if GC_PROFILE_MORE_DETAIL #if GC_PROFILE_MORE_DETAIL
record->gc_sweep_time += sweep_time; record->gc_sweep_time += sweep_time;
if (deferred_final_list) record->flags |= GPR_FLAG_HAVE_FINALIZE; if (deferred_final_list) record->flags |= GPR_FLAG_HAVE_FINALIZE;