diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-05 21:30:44 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-05 21:30:44 +0000 |
commit | 21cf3c6596de877dd12dcedb5637a1a8bf90b327 (patch) | |
tree | 70424bad0361858fbc23fbf8cacf0156f81c227a /railties/lib/commands/performance/profiler.rb | |
parent | 8a88513a999c854df51dce305b9fd7c0594d0b29 (diff) | |
download | rails-21cf3c6596de877dd12dcedb5637a1a8bf90b327.tar.gz rails-21cf3c6596de877dd12dcedb5637a1a8bf90b327.tar.bz2 rails-21cf3c6596de877dd12dcedb5637a1a8bf90b327.zip |
script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer. Closes #5679.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands/performance/profiler.rb')
-rw-r--r-- | railties/lib/commands/performance/profiler.rb | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/commands/performance/profiler.rb index 310d6764f1..464cea344d 100644 --- a/railties/lib/commands/performance/profiler.rb +++ b/railties/lib/commands/performance/profiler.rb @@ -1,5 +1,5 @@ if ARGV.empty? - $stderr.puts "Usage: ./script/performance/profiler 'Person.expensive_method(10)' [times]" + $stderr.puts "Usage: ./script/performance/profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]" exit(1) end @@ -16,14 +16,30 @@ 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) + begin + require "ruby-prof" + $stderr.puts 'Using the ruby-prof extension.' + RubyProf.clock_mode = RubyProf::WALL_TIME + RubyProf.start + profile_me + results = RubyProf.stop + if ARGV[2] + printer_class = RubyProf.const_get((ARGV[2] + "_printer").classify) + else + printer_class = RubyProf::FlatPrinter + end + printer = printer_class.new(results) + printer.print($stderr, 0) + rescue LoadError + require "prof" + $stderr.puts 'Using the old ruby-prof extension.' + Prof.clock_mode = Prof::GETTIMEOFDAY + Prof.start + profile_me + results = Prof.stop + require 'rubyprof_ext' + Prof.print_profile(results, $stderr) + end rescue LoadError require 'profiler' $stderr.puts 'Using the standard Ruby profiler.' |