aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-05-11 08:10:16 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-05-11 08:10:16 -0700
commit9cead4afbe7907914202c9bed780d0239a43baff (patch)
tree3bfc99668939c7207e4044cde35c3a1c9bda2678 /activesupport/lib
parent62f098dddf55a36e15c94a60b29c3c280b219cce (diff)
parent4b599611e4964adbdf7733831cb53de19d1f620f (diff)
downloadrails-9cead4afbe7907914202c9bed780d0239a43baff.tar.gz
rails-9cead4afbe7907914202c9bed780d0239a43baff.tar.bz2
rails-9cead4afbe7907914202c9bed780d0239a43baff.zip
Merge pull request #6262 from arunagw/ruby_prof_fix
Ruby prof fix
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby.rb2
1 files changed, 1 insertions, 1 deletions
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