Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Made the console and profiler work with the default 1.8.2 profiler #1325
[bitsweat] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1339 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
- Loading branch information
Showing
3 changed files
with
24 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,34 @@ | ||
#!/usr/local/bin/ruby | ||
|
||
if ARGV.empty? | ||
$stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times]" | ||
exit | ||
exit(1) | ||
end | ||
|
||
# Keep the expensive require out of the profile. | ||
puts 'Loading Rails...' | ||
$stderr.puts 'Loading Rails...' | ||
require File.dirname(__FILE__) + '/../config/environment' | ||
|
||
# Default to a single execution. | ||
N = (ARGV[1] || 1).to_i | ||
|
||
# Define a method to profile. | ||
eval <<end_eval | ||
def profile_me | ||
for i in 1..#{N} | ||
#{ARGV[0]} | ||
end | ||
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 | ||
end_eval | ||
|
||
# Require the profiler at_exit wrapper from railties/lib. | ||
require 'console_profile' | ||
|
||
# Blast off! | ||
profile_me | ||
# 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 | ||
$stderr.puts 'Using the standard Ruby profiler.' | ||
Profiler__.start_profile | ||
profile_me | ||
Profiler__.stop_profile | ||
Profiler__.print_profile($stderr) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +0,0 @@ | ||
# No GC nonsense. | ||
GC.disable | ||
|
||
# Try to load the ruby-prof extension; fail back to the pure-Ruby | ||
# profiler included in the standard library. | ||
begin | ||
require 'prof' | ||
Prof.clock_mode = Prof::CPU | ||
puts 'Using the fast ruby-prof extension' | ||
require 'unprof' | ||
rescue LoadError | ||
puts 'Using the slow pure-Ruby profiler' | ||
require 'profile' | ||
end | ||