aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-05-11 08:50:47 +0530
committerArun Agrawal <arunagw@gmail.com>2012-05-11 09:07:05 +0530
commit9d616ea360b439b9204c68748553ebb00ce7ef90 (patch)
tree032a500ef384fed3124cc29077f6d97791e0df7c
parent62f098dddf55a36e15c94a60b29c3c280b219cce (diff)
downloadrails-9d616ea360b439b9204c68748553ebb00ce7ef90.tar.gz
rails-9d616ea360b439b9204c68748553ebb00ce7ef90.tar.bz2
rails-9d616ea360b439b9204c68748553ebb00ce7ef90.zip
Update performance profiler to work with latest ruby-prof
Thanks to @carlosantoniodasilva
-rw-r--r--Gemfile2
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index a11091f075..0fc7fe3036 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ instance_eval File.read '.Gemfile' if File.exists? '.Gemfile'
platforms :mri do
group :test do
- gem 'ruby-prof', '0.10.8' if RUBY_VERSION < '1.9.3'
+ gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '1.9.3'
end
end
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 7d6d047ef6..96718d4bd3 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -36,7 +36,7 @@ module ActiveSupport
RubyProf.pause
full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
@data = RubyProf.stop
- @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time }
+ @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
end
def record