diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-26 04:31:10 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-26 04:31:10 +0000 |
commit | d03912898e8fd37ad9ad82a9e6765fe8f1d78536 (patch) | |
tree | 132a8055ed81af8482ecf8ca1f83a5f3c606127c | |
parent | fdf7b4586fe91756b9a8b6ed1bf5d9b37c1aab6d (diff) | |
download | ruby-d03912898e8fd37ad9ad82a9e6765fe8f1d78536.tar.gz |
* gc.c (gc_sweep, gc_heap_lazy_sweep): fix measurement code.
We only need one sweep time measurement without lazy sweep.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Oct 26 13:25:45 2013 Koichi Sasada <ko1@atdot.net> + + * gc.c (gc_sweep, gc_heap_lazy_sweep): fix measurement code. + We only need one sweep time measurement without lazy sweep. + Sat Oct 26 11:59:13 2013 Tanaka Akira <akr@fsij.org> * addr2line.c: Include ELF header after system headers (especially @@ -2601,7 +2601,9 @@ gc_heap_lazy_sweep(rb_objspace_t *objspace, rb_heap_t *heap) if (page == NULL) return FALSE; +#if GC_ENABLE_LAZY_SWEEP gc_prof_sweep_timer_start(objspace); +#endif while (page) { heap->sweep_pages = next = page->next; @@ -2618,7 +2620,9 @@ gc_heap_lazy_sweep(rb_objspace_t *objspace, rb_heap_t *heap) page = next; } +#if GC_ENABLE_LAZY_SWEEP gc_prof_sweep_timer_stop(objspace); +#endif return result; } @@ -2646,12 +2650,14 @@ static void gc_sweep(rb_objspace_t *objspace, int immediate_sweep) { if (immediate_sweep) { +#if !GC_ENABLE_LAZY_SWEEP gc_prof_sweep_timer_start(objspace); +#endif gc_before_sweep(objspace); - gc_heap_rest_sweep(objspace, heap_eden); - +#if !GC_ENABLE_LAZY_SWEEP gc_prof_sweep_timer_stop(objspace); +#endif } else { gc_before_sweep(objspace); |