Changeset 2704 for lang/ruby/ssb

Timestamp:

12/07/07 08:53:56 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: refactored TimeStamp?

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb.rb (modified) (1 diff)
• libs/ssb/time_stamper.rb (modified) (2 diffs)
• templates/ssb.rhtml (modified) (2 diffs)
• test/time_stamper_test.rb (modified) (2 diffs)

lang/ruby/ssb/trunk/libs/ssb.rb

@@ -20 +20 @@
   class Application
     def initialize
-      @time_stamp = SSB::TimeStamper.new
-    end
-
-    # リクエスト開始 〜 終了
-    def request_time
-      @time_stamp.diff(:request_start, :request_finish)
-    end
-
-    # 処理開始 〜 処理完了
-    def proc_time
-      @time_stamp.diff(:request_finish, :proc_finish)
-    end
-
-    # リクエスト終了 〜 処理完了
-    def total_time
-      proc_time + request_time
+      @time_stamp = SSB::TimeStamper.new({
+                                         :request_time => [:request_start, :request_finish],
+                                         :proc_time    => [:request_finish, :proc_finish],
+                                         :total_time   => [:request_start, :request_proc_finish],
+                                         })
     end
 

lang/ruby/ssb/trunk/libs/ssb/time_stamper.rb

@@ -8 +8 @@
 module SSB
   class TimeStamper
-    def initialize
+    attr_reader :log
+
+    # { span_label => [stamp_from, stamp_to], ... }
+    def initialize(span_defs = nil)
+      @span_defs = Hash.new
+      @span_defs.update(span_defs) unless span_defs.nil?
       @log = Hash.new
     end
 
-    def stamp(label)
-      @log[label] = Time.now
-      @log[label]
+    def span_labels
+      @span_defs.keys
     end
 
-    def diff(from, to)
-      ((self[to].to_f - self[from].to_f)*1000).to_i
+    def span(label)
+      diff(@span_defs[label][0], @span_defs[label][1])
+    end
+
+    def stamp(stamp, time = Time.now)
+      @log[stamp] = time
+    end
+
+    def diff(stamp_from, stamp_to)
+      ((@log[stamp_to].to_f - @log[stamp_from].to_f)*1000).to_i
     end
 
@@ -28 +40 @@
       @log[label]
     end
+
+    def method_missing(msg, *args)
+      if span_labels.include?(msg.to_sym)
+        span(msg.to_sym)
+      else
+        #super
+      end
+    end
   end
 end

lang/ruby/ssb/trunk/templates/ssb.rhtml

@@ -52 +52 @@
               <%
   time_class =
-  case request_time
+  case @time_stamp.request_time
   when 0..500
     "time_safe"
@@ -60 +60 @@
     "time_warning"
   end %>
-              <td class="<%= time_class %>"><%= SSB::Misc.numeric(request_time) %></td>
+              <td class="<%= time_class %>"><%= SSB::Misc.numeric(@time_stamp.request_time) %></td>
               <td class="time_unit">ms</td>
             </tr>
             <tr>
               <td class="time_label">変換処理時間</td>
-              <td class="time"><%= SSB::Misc.numeric(proc_time) %></td>
+              <td class="time"><%= SSB::Misc.numeric(@time_stamp.proc_time) %></td>
               <td class="time_unit">ms</td>
             </tr>
             <tr>
               <td class="time_label">合計</td>
-              <td class="time"><%= SSB::Misc.numeric(total_time) %></td>
+              <td class="time"><%= SSB::Misc.numeric(@time_stamp.total_time) %></td>
               <td class="time_unit">ms</td>
             </tr>

lang/ruby/ssb/trunk/test/time_stamper_test.rb

@@ -3 +3 @@
 
 unit_tests do
-  test 'instance' do
-    assert SSB::TimeStamper.new
+  test 'instance default' do
+    stamp = SSB::TimeStamper.new
+    assert stamp
+    assert_instance_of(Hash, stamp.log)
+    assert_equal(stamp.log.size, 0)
+    assert_instance_of(Array, stamp.span_labels)
+    assert_equal(stamp.span_labels.size, 0)
   end
 
-  test 'stampit' do
+  test 'instance with span definision' do
+    stamp = SSB::TimeStamper.new({
+                                   :test1 => [:test1_start, :test1_done],
+                                   :test2 => [:test2_start, :test2_done],
+                                   :test3 => [:test3_start, :test3_done],
+                                   :total => [:test1_start, :test3_done],})
+    assert stamp
+    assert_instance_of(Hash, stamp.log)
+    assert_equal(stamp.log.size, 0)
+    assert_instance_of(Array, stamp.span_labels)
+    assert_equal(stamp.span_labels.size, 4)
+    assert(stamp.span_labels.include?(:test1))
+    assert(stamp.span_labels.include?(:test2))
+    assert(stamp.span_labels.include?(:test3))
+    assert(stamp.span_labels.include?(:total))
+  end
+
+  test 'simple stamp collect' do
     stamp = SSB::TimeStamper.new
     now = Time.now
 
-    assert_equal(stamp.count, 0)
     stamped = stamp.stamp(:test)
+
     assert_equal(stamped.class, Time)
     assert(stamped >= now)
@@ -19 +41 @@
     assert_equal(stamped, stamp[:test])
   end
+
+  test 'stamp span' do
+    stamp = SSB::TimeStamper.new({
+                                   :test1 => [:test1_start, :test1_done],
+                                   :test2 => [:test2_start, :test2_done],
+                                   :test3 => [:test3_start, :test3_done],
+                                   :total => [:test1_start, :test3_done],})
+
+    stamp.stamp :test1_start, Time.at(1)
+    stamp.stamp :test1_done, Time.at(2)
+    assert_equal(stamp.count, 2)
+    assert_equal(stamp.span(:test1), 1000)
+    assert_equal(stamp.test1, 1000)
+
+    stamp.stamp :test2_start, Time.at(3)
+    stamp.stamp :test2_done, Time.at(5)
+    assert_equal(stamp.count, 4)
+    assert_equal(stamp.span(:test2), 2000)
+    assert_equal(stamp.test2, 2000)
+
+    stamp.stamp :test3_start, Time.at(8)
+    stamp.stamp :test3_done, Time.at(13)
+    assert_equal(stamp.count, 6)
+    assert_equal(stamp.span(:test3), 5000)
+    assert_equal(stamp.test3, 5000)
+
+    assert_equal(stamp.span(:total), 12000)
+    assert_equal(stamp.total, 12000)
+  end
 end