From 2bb72134b57e92109809ed80d725001d5db0a8cf Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 14 Oct 2005 02:28:56 +0000 Subject: Fix spelling git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2574 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/commands/perfom/benchmarker | 19 ----------------- railties/lib/commands/perfom/profiler | 35 ------------------------------- railties/lib/commands/perform.rb | 2 +- railties/lib/commands/perform/benchmarker | 19 +++++++++++++++++ railties/lib/commands/perform/profiler | 35 +++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 railties/lib/commands/perfom/benchmarker delete mode 100644 railties/lib/commands/perfom/profiler create mode 100644 railties/lib/commands/perform/benchmarker create mode 100644 railties/lib/commands/perform/profiler (limited to 'railties/lib') diff --git a/railties/lib/commands/perfom/benchmarker b/railties/lib/commands/perfom/benchmarker deleted file mode 100644 index b07ddcfcb2..0000000000 --- a/railties/lib/commands/perfom/benchmarker +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/local/bin/ruby - -if ARGV.empty? - puts "Usage: benchmarker times 'Person.expensive_way' 'Person.another_expensive_way' ..." - exit -end - -require File.dirname(__FILE__) + '/../config/environment' -require 'benchmark' -include Benchmark - -# Don't include compilation in the benchmark -ARGV[1..-1].each { |expression| eval(expression) } - -bm(6) do |x| - ARGV[1..-1].each_with_index do |expression, idx| - x.report("##{idx + 1}") { ARGV[0].to_i.times { eval(expression) } } - end -end \ No newline at end of file diff --git a/railties/lib/commands/perfom/profiler b/railties/lib/commands/perfom/profiler deleted file mode 100644 index d84c8b739f..0000000000 --- a/railties/lib/commands/perfom/profiler +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/local/bin/ruby -if ARGV.empty? - $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times]" - exit(1) -end - -# Keep the expensive require out of the profile. -$stderr.puts 'Loading Rails...' -require File.dirname(__FILE__) + '/../config/environment' - -# Define a method to profile. -if ARGV[1] and ARGV[1].to_i > 1 - eval "def profile_me() #{ARGV[1]}.times { #{ARGV[0]} } end" -else - eval "def profile_me() #{ARGV[0]} end" -end - -# Use the ruby-prof extension if available. Fall back to stdlib profiler. -begin - require 'prof' - $stderr.puts 'Using the ruby-prof extension.' - Prof.clock_mode = Prof::GETTIMEOFDAY - Prof.start - profile_me - results = Prof.stop - require 'rubyprof_ext' - Prof.print_profile(results, $stderr) -rescue LoadError - require 'profiler' - $stderr.puts 'Using the standard Ruby profiler.' - Profiler__.start_profile - profile_me - Profiler__.stop_profile - Profiler__.print_profile($stderr) -end diff --git a/railties/lib/commands/perform.rb b/railties/lib/commands/perform.rb index 6c09565896..0cc04f2c87 100644 --- a/railties/lib/commands/perform.rb +++ b/railties/lib/commands/perform.rb @@ -1,5 +1,5 @@ if %w( benchmarker profiler ).include?(ARGV.first) - require "#{File.dirname(__FILE__)}/process/#{ARGV.shift}" + require "#{File.dirname(__FILE__)}/perform/#{ARGV.shift}" else puts "Choose either benchmarker or profiler" end \ No newline at end of file diff --git a/railties/lib/commands/perform/benchmarker b/railties/lib/commands/perform/benchmarker new file mode 100644 index 0000000000..b07ddcfcb2 --- /dev/null +++ b/railties/lib/commands/perform/benchmarker @@ -0,0 +1,19 @@ +#!/usr/local/bin/ruby + +if ARGV.empty? + puts "Usage: benchmarker times 'Person.expensive_way' 'Person.another_expensive_way' ..." + exit +end + +require File.dirname(__FILE__) + '/../config/environment' +require 'benchmark' +include Benchmark + +# Don't include compilation in the benchmark +ARGV[1..-1].each { |expression| eval(expression) } + +bm(6) do |x| + ARGV[1..-1].each_with_index do |expression, idx| + x.report("##{idx + 1}") { ARGV[0].to_i.times { eval(expression) } } + end +end \ No newline at end of file diff --git a/railties/lib/commands/perform/profiler b/railties/lib/commands/perform/profiler new file mode 100644 index 0000000000..d84c8b739f --- /dev/null +++ b/railties/lib/commands/perform/profiler @@ -0,0 +1,35 @@ +#!/usr/local/bin/ruby +if ARGV.empty? + $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times]" + exit(1) +end + +# Keep the expensive require out of the profile. +$stderr.puts 'Loading Rails...' +require File.dirname(__FILE__) + '/../config/environment' + +# Define a method to profile. +if ARGV[1] and ARGV[1].to_i > 1 + eval "def profile_me() #{ARGV[1]}.times { #{ARGV[0]} } end" +else + eval "def profile_me() #{ARGV[0]} end" +end + +# Use the ruby-prof extension if available. Fall back to stdlib profiler. +begin + require 'prof' + $stderr.puts 'Using the ruby-prof extension.' + Prof.clock_mode = Prof::GETTIMEOFDAY + Prof.start + profile_me + results = Prof.stop + require 'rubyprof_ext' + Prof.print_profile(results, $stderr) +rescue LoadError + require 'profiler' + $stderr.puts 'Using the standard Ruby profiler.' + Profiler__.start_profile + profile_me + Profiler__.stop_profile + Profiler__.print_profile($stderr) +end -- cgit v1.2.3