diff options
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 6 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/rubinius.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb index f0287b0440..02c19448fd 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -90,6 +90,8 @@ module ActiveSupport if klass = Metrics[metric_name.to_sym] run_profile(klass.new) result.add_run + else + puts '%20s: unsupported' % metric_name end end end @@ -256,9 +258,7 @@ module ActiveSupport @name ||= self.class.name.demodulize.underscore end - def benchmark - @unsureturn if measure.nil? - + def benchmark with_gc_stats do before = measure yield diff --git a/activesupport/lib/active_support/testing/performance/rubinius.rb b/activesupport/lib/active_support/testing/performance/rubinius.rb index fbb58a2b3a..198d235548 100644 --- a/activesupport/lib/active_support/testing/performance/rubinius.rb +++ b/activesupport/lib/active_support/testing/performance/rubinius.rb @@ -84,19 +84,19 @@ module ActiveSupport end end - class Memory < DigitalInformationUnit + class Memory < DigitalInformationUnit def measure loopback.get("system.memory.counter.bytes").last end end - class Objects < Amount + class Objects < Amount def measure loopback.get("system.memory.counter.objects").last end end - class GcRuns < Amount + class GcRuns < Amount def measure loopback.get("system.gc.full.count").last + loopback.get("system.gc.young.count").last end |