summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--benchmark/gc/gcbench.rb5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 290fdb371b..77a5048781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 20 18:29:26 2013 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/gc/gcbench.rb: Do not use GC::Profiler::disable because
+ GC::Profiler::disable prohibit to access profiling data. It should
+ be spec bug.
+
+ Skip GC::Profiler::report if RUBY_VERSION < '2.0.0'
+
Thu Jun 20 17:59:08 2013 Koichi Sasada <ko1@atdot.net>
* benchmark/gc/gcbench.rb: stop GC::Profiler before output results.
diff --git a/benchmark/gc/gcbench.rb b/benchmark/gc/gcbench.rb
index aa92f0827d..12ab042ec3 100644
--- a/benchmark/gc/gcbench.rb
+++ b/benchmark/gc/gcbench.rb
@@ -12,12 +12,11 @@ GC::Profiler.enable
tms = Benchmark.measure{|x|
load script
}
+gc_time = GC::Profiler.total_time
+GC::Profiler.report if RUBY_VERSION >= '2.0.0' # before 1.9.3, report() may run infinite loop
GC::Profiler.disable
-GC::Profiler.report
pp GC.stat
-gc_time = GC::Profiler.total_time
-
puts
puts script
puts Benchmark::CAPTION