diff options
author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-28 04:19:39 +0100 |
---|---|---|
committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-28 04:19:39 +0100 |
commit | 726b7ede54031eecfcee34eec80040553e9ad19f (patch) | |
tree | 1e4da2700e3fa2b5f459d7ec3e0222a9ba75cb36 /activesupport/lib/active_support/testing/performance/ruby | |
parent | 09bd0eeefc5cb3c2cb26e17b486dd0965afbf4d5 (diff) | |
download | rails-726b7ede54031eecfcee34eec80040553e9ad19f.tar.gz rails-726b7ede54031eecfcee34eec80040553e9ad19f.tar.bz2 rails-726b7ede54031eecfcee34eec80040553e9ad19f.zip |
improved detection and feedback of supported/unsupported metrics
Diffstat (limited to 'activesupport/lib/active_support/testing/performance/ruby')
-rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby/mri.rb | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby/yarv.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/performance/ruby/mri.rb b/activesupport/lib/active_support/testing/performance/ruby/mri.rb index 512eff30e2..22c31927f0 100644 --- a/activesupport/lib/active_support/testing/performance/ruby/mri.rb +++ b/activesupport/lib/active_support/testing/performance/ruby/mri.rb @@ -16,7 +16,7 @@ module ActiveSupport end end - class Memory < Base + class Memory < DigitalInformationUnit # Ruby 1.8 + ruby-prof wrapper if RubyProf.respond_to?(:measure_memory) def measure diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb index 38b6e67767..dcbea17a22 100644 --- a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb +++ b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb @@ -23,7 +23,7 @@ module ActiveSupport end end - class Memory < Base + class Memory < DigitalInformationUnit # Ruby 1.9 + GCdata patch if GC.respond_to?(:malloc_allocated_size) def measure |