process time for benchmarks (quicker), wall time for profiling (lower overhead)

1 files changed, 14 insertions, 10 deletions

diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index b8e4f46d70..24936029a2 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -8,16 +8,20 @@ require 'rails/version'
 module ActiveSupport
   module Testing
     module Performance
-      benchmark = ARGV.include?('--benchmark')  # HAX for rake test
-
-      DEFAULTS = {
-        :benchmark => benchmark,
-        :runs => benchmark ? 10 : 1,
-        :min_percent => 0.02,
-        :metrics => [:process_time, :wall_time, :cpu_time, :memory, :objects],
-        :formats => [:flat, :graph_html, :call_tree],
-        :output => 'tmp/performance'
-      }
+      DEFAULTS =
+        if benchmark = ARGV.include?('--benchmark')  # HAX for rake test
+          { :benchmark => true,
+            :runs => 10,
+            :metrics => [:process_time, :memory, :objects],
+            :output => 'tmp/performance' }
+        else
+          { :benchmark => false,
+            :runs => 1,
+            :min_percent => 0.02,
+            :metrics => [:wall_time, :memory, :objects],
+            :formats => [:flat, :graph_html, :call_tree],
+            :output => 'tmp/performance' }
+        end
 
       def self.included(base)
         base.class_inheritable_hash :profile_options