GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Use a more sensible resolution on the new millisecond benchmarks
dhh (author)
Fri Sep 05 05:58:34 -0700 2008
commit  227ee2ecb46f1609938a83ed82abde1a45ebe2eb
tree    49e523792a1446a9b5dd1416489ed5af666f0a9b
parent  de0e7507de826bf77fd57cc2a51e27388cb62ff7
...
6
7
8
9
 
10
11
12
13
 
14
15
16
...
6
7
8
 
9
10
11
12
 
13
14
15
16
0
@@ -6,11 +6,11 @@
0
 
0
 * Changed logging format to be millisecond based and skip misleading stats [DHH]. Went from:
0
 
0
- Completed in 0.10000 (4 reqs/sec) | Rendering: 0.40000 (40%) | DB: 0.04000 (4%) | 200 OK [http://example.com]
0
+ Completed in 0.10000 (4 reqs/sec) | Rendering: 0.04000 (40%) | DB: 0.00400 (4%) | 200 OK [http://example.com]
0
 
0
   ...to:
0
   
0
- Completed in 100.00ms (View: 400.00, DB: 40.00) | 200 OK [http://example.com]
0
+ Completed in 100ms (View: 40, DB: 4) | 200 OK [http://example.com]
0
 
0
 * Add support for shallow nesting of routes. #838 [S. Brent Faulkner]
0
 
...
24
25
26
27
 
28
29
30
...
69
70
71
72
 
73
74
75
...
86
87
88
89
 
90
91
92
93
94
95
96
 
97
98
99
100
101
102
103
 
104
105
106
...
24
25
26
 
27
28
29
30
...
69
70
71
 
72
73
74
75
...
86
87
88
 
89
90
91
92
93
94
95
 
96
97
98
99
100
101
102
 
103
104
105
106
0
@@ -24,7 +24,7 @@ module ActionController #:nodoc:
0
         if logger && logger.level == log_level
0
           result = nil
0
           seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
0
- logger.add(log_level, "#{title} (#{('%.2f' % (seconds * 1000))}ms)")
0
+ logger.add(log_level, "#{title} (#{('%.1f' % (seconds * 1000))}ms)")
0
           result
0
         else
0
           yield
0
@@ -69,7 +69,7 @@ module ActionController #:nodoc:
0
           logging_view = defined?(@view_runtime)
0
           logging_active_record = Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
0
 
0
- log_message = "Completed in #{sprintf("%.2f", seconds * 1000)}ms"
0
+ log_message = "Completed in #{sprintf("%.0f", seconds * 1000)}ms"
0
 
0
           if logging_view || logging_active_record
0
             log_message << " ("
0
@@ -86,21 +86,21 @@ module ActionController #:nodoc:
0
           log_message << " [#{complete_request_uri rescue "unknown"}]"
0
 
0
           logger.info(log_message)
0
- response.headers["X-Runtime"] = "#{sprintf("%.2f", seconds * 1000)}ms"
0
+ response.headers["X-Runtime"] = "#{sprintf("%.0f", seconds * 1000)}ms"
0
         else
0
           perform_action_without_benchmark
0
         end
0
       end
0
 
0
       def view_runtime
0
- "View: %.2f" % (@view_runtime * 1000)
0
+ "View: %.0f" % (@view_runtime * 1000)
0
       end
0
 
0
       def active_record_runtime
0
         db_runtime = ActiveRecord::Base.connection.reset_runtime
0
         db_runtime += @db_rt_before_render if @db_rt_before_render
0
         db_runtime += @db_rt_after_render if @db_rt_after_render
0
- "DB: %.2f" % (db_runtime * 1000)
0
+ "DB: %.0f" % (db_runtime * 1000)
0
       end
0
   end
0
 end
...
15
16
17
18
 
19
20
21
...
23
24
25
26
 
27
28
29
...
15
16
17
 
18
19
20
21
...
23
24
25
 
26
27
28
29
0
@@ -15,7 +15,7 @@ module ActionView
0
       # <%= expensive_files_operation %>
0
       # <% end %>
0
       #
0
- # That would add something like "Process data files (345.23ms)" to the log,
0
+ # That would add something like "Process data files (345.2ms)" to the log,
0
       # which you can then use to compare timings when optimizing your code.
0
       #
0
       # You may give an optional logger level as the second argument
0
@@ -23,7 +23,7 @@ module ActionView
0
       def benchmark(message = "Benchmarking", level = :info)
0
         if controller.logger
0
           seconds = Benchmark.realtime { yield }
0
- controller.logger.send(level, "#{message} (#{'%.2f' % (seconds * 1000)}ms)")
0
+ controller.logger.send(level, "#{message} (#{'%.1f' % (seconds * 1000)}ms)")
0
         else
0
           yield
0
         end
...
1313
1314
1315
1316
 
1317
1318
1319
...
1313
1314
1315
 
1316
1317
1318
1319
0
@@ -1313,7 +1313,7 @@ module ActiveRecord #:nodoc:
0
         if logger && logger.level <= log_level
0
           result = nil
0
           seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
0
- logger.add(log_level, "#{title} (#{'%.2f' % (seconds * 1000)}ms)")
0
+ logger.add(log_level, "#{title} (#{'%.1f' % (seconds * 1000)}ms)")
0
           result
0
         else
0
           yield
...
149
150
151
152
 
153
154
155
...
149
150
151
 
152
153
154
155
0
@@ -149,7 +149,7 @@ module ActiveRecord
0
 
0
       def log_info(sql, name, seconds)
0
         if @logger && @logger.debug?
0
- name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.2f", seconds * 1000)}ms)"
0
+ name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.1f", seconds * 1000)}ms)"
0
           @logger.debug(format_log_entry(name, sql.squeeze(' ')))
0
         end
0
       end

Comments

    No one has commented yet.