From dcc99e23cddab727fec2f7026bc30be18b07cee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= <goncalossilva@gmail.com>
Date: Tue, 10 May 2011 02:33:01 +0100
Subject: benchmarker and profiler now use the new performance testing tools
 (support for Rubinius and JRuby and high configurability)

---
 railties/lib/rails/commands/benchmarker.rb | 47 ++++++++++++++++++------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'railties/lib/rails/commands/benchmarker.rb')

diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
index f230f405c0..b06c915ac3 100644
--- a/railties/lib/rails/commands/benchmarker.rb
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -1,25 +1,34 @@
-require 'active_support/core_ext/object/inclusion'
+require 'optparse'
+require 'rails/test_help'
+require 'rails/performance_test_help'
 
-if ARGV.first.in?([nil, "-h", "--help"])
-  puts "Usage: rails benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
-  exit 1
-end
+ARGV.push('--benchmark') # HAX
+require 'active_support/testing/performance'
+ARGV.pop
 
-begin
-  N = Integer(ARGV.first)
-  ARGV.shift
-rescue ArgumentError
-  N = 1
+def options
+  options = {}
+  defaults = ActiveSupport::Testing::Performance::DEFAULTS
+  
+  OptionParser.new do |opt|
+    opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
+    opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
+    opt.on('-o', '--output PATH', String, 'Directory to use when writing the results.', "Default: #{defaults[:output]}") { |o| options[:output] = o }
+    opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
+    opt.parse!(ARGV)
+  end
+  
+  options
 end
 
-require 'benchmark'
-include Benchmark
-
-# Don't include compilation in the benchmark
-ARGV.each { |expression| eval(expression) }
-
-bm(6) do |x|
-  ARGV.each_with_index do |expression, idx|
-    x.report("##{idx + 1}") { N.times { eval(expression) } }
+class BenchmarkerTest < ActionDispatch::PerformanceTest
+  self.profile_options = options
+  
+  ARGV.each do |expression|
+    eval <<-RUBY
+      def test_#{expression.parameterize('_')}
+        #{expression}
+      end
+    RUBY
   end
 end
-- 
cgit v1.2.3