diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-21 06:29:30 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-21 06:29:30 +0000 |
commit | ab084f406319dcfd06a4f7922fcb6e95ccec22bc (patch) | |
tree | b45dc329ae7d862f4d07526ea17f627061fb3212 /gc.c | |
parent | 0e8fc182e348442476065886aef7c0b20400d87f (diff) |
* gc.c (gc_sweep): profile sweep time correctly when LAZY_SWEEP is
disabled.
* gc.c (gc_marks_test): store oldgen count and shady count
before test marking and restore them after marking.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -2420,6 +2420,7 @@ gc_sweep(rb_objspace_t *objspace, int immediate_sweep) { if (immediate_sweep) { struct heaps_slot *next; + gc_prof_sweep_timer_start(objspace); before_gc_sweep(objspace); while (objspace->heap.sweep_slots) { @@ -2429,6 +2430,7 @@ gc_sweep(rb_objspace_t *objspace, int immediate_sweep) } after_gc_sweep(objspace); + gc_prof_sweep_timer_stop(objspace); } else { before_gc_sweep(objspace); @@ -3553,12 +3555,19 @@ gc_marks_test(rb_objspace_t *objspace, bits_t *before_stored_bitmaps) { bits_t *stored_bitmaps = gc_store_bitmaps(objspace); size_t i; + size_t stored_oldgen, stored_shady; rgengc_report(1, objspace, "gc_marks_test: test-full-gc\n"); /* run major (full) gc with temporary mark/rememberset */ - gc_marks_body(objspace, FALSE); + stored_oldgen = objspace->rgengc.oldgen_object_count; + stored_shady = objspace->rgengc.remembered_shady_object_count; + { + gc_marks_body(objspace, FALSE); + } objspace->rgengc.during_minor_gc = TRUE; + objspace->rgengc.oldgen_object_count = stored_oldgen; + objspace->rgengc.remembered_shady_object_count = stored_shady; /* check */ for (i=0; i<heaps_used; i++) { @@ -5064,9 +5073,9 @@ gc_prof_sweep_timer_stop(rb_objspace_t *objspace) if (RUBY_DTRACE_GC_SWEEP_END_ENABLED()) { RUBY_DTRACE_GC_SWEEP_END(); } + if (objspace->profile.run) { double sweep_time; - gc_profile_record *record = gc_prof_record(objspace); if (record->gc_time > 0) { |