Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8356

Show
Ignore:
Timestamp:
12/10/07 02:57:19 (9 months ago)
Author:
bitsweat
Message:

Merge [8355] from trunk: fix strange NoMemoryError on amd64. References #10442 [wrb]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1-2-stable/actionpack/lib/action_controller/benchmarking.rb

    r4595 r8356  
    7676    private 
    7777      def rendering_runtime(runtime) 
    78         " | Rendering: #{sprintf("%.5f", @rendering_runtime)} (#{sprintf("%d", (@rendering_runtime * 100) / runtime)}%)" 
     78        percentage = @rendering_runtime * 100 / runtime 
     79        " | Rendering: %.5f (%d%%)" % [@rendering_runtime, percentage.to_i] 
    7980      end 
    8081 
     
    8384        db_runtime    += @db_rt_before_render if @db_rt_before_render 
    8485        db_runtime    += @db_rt_after_render if @db_rt_after_render 
    85         db_percentage = (db_runtime * 100) / runtime 
    86         " | DB: #{sprintf("%.5f", db_runtime)} (#{sprintf("%d", db_percentage)}%)" 
     86        db_percentage = db_runtime * 100 / runtime 
     87        " | DB: %.5f (%d%%)" % [db_runtime, db_percentage.to_i] 
    8788      end 
    8889  end