diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gc.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 10 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Oct 29 11:10:08 2013 Aman Gupta <ruby@tmm1.net> + + * gc.c (gc_profile_total_time): fix off-by-one error in + GC::Profiler.total_time. + * test/ruby/test_gc.rb (class TestGc): test for above. + Tue Oct 29 09:53:00 2013 Charlie Somerville <charliesome@ruby-lang.org> * insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split @@ -6140,7 +6140,7 @@ gc_profile_total_time(VALUE self) if (objspace->profile.run && objspace->profile.next_index > 0) { size_t i; - size_t count = objspace->profile.next_index - 1; + size_t count = objspace->profile.next_index; for (i = 0; i < count; i++) { time += objspace->profile.records[i].gc_time; diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index dfe5e31cfb..4218dab888 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -166,6 +166,16 @@ class TestGc < Test::Unit::TestCase eom end + def test_profiler_total_time + GC::Profiler.enable + GC::Profiler.clear + + GC.start + assert_operator(GC::Profiler.total_time, :>, 0) + ensure + GC::Profiler.disable + end + def test_finalizing_main_thread assert_in_out_err(%w[--disable-gems], <<-EOS, ["\"finalize\""], [], "[ruby-dev:46647]") ObjectSpace.define_finalizer(Thread.main) { p 'finalize' } |