rumx 0.1.0 → 0.1.1

data/History.md

@@ -1,6 +1,11 @@
 Rumx Changelog
 =====================
 
+0.1.1
+
+ - Changed Bean::Timer attribute total_count to count and added non-resettable total_count as attribute.
+   For munin, this allows the total count to be collected in a separate call without worrying about it being reset.
+
 0.1.0
 
  - Removed the following methods and the equivalient writers and accessors to hopefully make the commands more consistent:

data/lib/rumx/beans/timer.rb

@@ -3,27 +3,28 @@ module Rumx
     class Timer
       include Bean
 
-      bean_attr_reader     :total_count, :integer, 'Number of times the measured block has run'
-      bean_attr_reader     :total_time,  :float,   'Total time (msec) for all the runs of the timed instruction'
-      bean_attr_reader     :max_time,    :float,   'The maximum time (msec) for all the runs of the timed instruction'
-      bean_attr_reader     :min_time,    :float,   'The minimum time (msec) for all the runs of the timed instruction'
-      bean_attr_reader     :last_time,   :float,   'The time (msec) for the last run of the timed instruction'
-      bean_reader          :avg_time,    :float,   'The average time (msec) for all runs of the timed instruction'
-      bean_writer          :reset,       :boolean, 'Reset the times and counts to zero (Note that last_time is not reset)'
+      bean_attr_reader :total_count, :integer, 'Number of times the measured block has run'
+      bean_attr_reader :count,       :integer, 'Number of times the measured block has run since the last reset'
+      bean_attr_reader :max_time,    :float,   'The maximum time (msec) for all the runs of the timed instruction'
+      bean_attr_reader :min_time,    :float,   'The minimum time (msec) for all the runs of the timed instruction'
+      bean_attr_reader :last_time,   :float,   'The time (msec) for the last run of the timed instruction'
+      bean_reader      :avg_time,    :float,   'The average time (msec) for all runs of the timed instruction'
+      bean_writer      :reset,       :boolean, 'Reset the times and counts to zero (Note that total_count and last_time are not reset)'
 
       def initialize(opts={})
         # Force initialization of Bean#bean_monitor to avoid race condition (See bean.rb)
         bean_monitor
-        @last_time = 0.0
-        self.reset = true
+        @total_count = 0
+        @last_time   = 0.0
+        self.reset   = true
       end
 
       def reset=(val)
         if val
-          @total_count = 0
-          @min_time    = nil
-          @max_time    = 0.0
-          @total_time  = 0.0
+          @count    = 0
+          @min_time = nil
+          @max_time = 0.0
+          @sum_time = 0.0
         end
       end
 
@@ -35,8 +36,9 @@ module Rumx
           current_time = (Time.now.to_f - start_time.to_f) * 1000.0
           bean_synchronize do
             @last_time    = current_time
+            @count       += 1
             @total_count += 1
-            @total_time  += current_time
+            @sum_time    += current_time
             @min_time     = current_time if !@min_time || current_time < @min_time
             @max_time     = current_time if current_time > @max_time
           end
@@ -50,13 +52,13 @@ module Rumx
 
       def avg_time
         # Do the best we can w/o mutexing
-        count, time = @total_count, @total_time
+        count, time = @count, @sum_time
         return 0.0 if count == 0
         time / count
       end
 
       def to_s
-        "total_count=#{@total_count} min=#{('%.1f' % min_time)}ms max=#{('%.1f' % max_time)}ms avg=#{('%.1f' % avg_time)}ms"
+        "total_count=#{@total_count} count=#{@count} min=#{('%.1f' % min_time)}ms max=#{('%.1f' % max_time)}ms avg=#{('%.1f' % avg_time)}ms"
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: rumx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
   - Brad Pardee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2011-12-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: sinatra