diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-10 02:45:13 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-10 02:45:13 +0000 |
commit | f6d45ce95dae13bce93446b678148327edeaf6b8 (patch) | |
tree | 844a9bdb924a632acc8a015ae9f566906078cc76 /actionpack/lib/action_controller | |
parent | 836f32cf7d5303e6582f4b89664755ab617827fd (diff) | |
download | rails-f6d45ce95dae13bce93446b678148327edeaf6b8.tar.gz rails-f6d45ce95dae13bce93446b678148327edeaf6b8.tar.bz2 rails-f6d45ce95dae13bce93446b678148327edeaf6b8.zip |
Fix strange NoMemoryError on amd64. Closes #10442 [wrb]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8355 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index 31fa5d940d..5201d31b8b 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -79,15 +79,16 @@ module ActionController #:nodoc: end def rendering_runtime(runtime) - " | Rendering: #{sprintf("%.5f", @rendering_runtime)} (#{sprintf("%d", (@rendering_runtime * 100) / runtime)}%)" + percentage = @rendering_runtime * 100 / runtime + " | Rendering: %.5f (%d%%)" % [@rendering_runtime, percentage.to_i] end def active_record_runtime(runtime) db_runtime = ActiveRecord::Base.connection.reset_runtime db_runtime += @db_rt_before_render if @db_rt_before_render db_runtime += @db_rt_after_render if @db_rt_after_render - db_percentage = (db_runtime * 100) / runtime - " | DB: #{sprintf("%.5f", db_runtime)} (#{sprintf("%d", db_percentage)}%)" + db_percentage = db_runtime * 100 / runtime + " | DB: %.5f (%d%%)" % [db_runtime, db_percentage.to_i] end end -end
\ No newline at end of file +end |