metriks 0.9.9.1 → 0.9.9.2

data/lib/metriks/meter.rb

@@ -4,25 +4,22 @@ require 'metriks/ewma'
 
 module Metriks
   class Meter
+    TICK_INTERVAL = 5.0
+
     def initialize(averager_klass = Metriks::EWMA)
       @count = Atomic.new(0)
-      @start_time = Time.now
+      @start_time = Time.now.to_f
+      @last_tick = Atomic.new(@start_time)
 
       @m1_rate  = averager_klass.new_m1
       @m5_rate  = averager_klass.new_m5
       @m15_rate = averager_klass.new_m15
-
-      @thread = Thread.new do
-        loop do
-          sleep averager_klass::INTERVAL
-          tick
-        end
-      end
     end
 
     def clear
       @count.value = 0
-      @start_time = Time.now
+      @start_time = Time.now.to_f
+      @last_tick.value = @start_time
       @m1_rate.clear
       @m5_rate.clear
       @m15_rate.clear
@@ -34,7 +31,20 @@ module Metriks
       @m15_rate.tick
     end
 
+    def tick_if_nessesary
+      old_tick = @last_tick.value
+      new_tick = Time.new.to_f
+      age = new_tick - old_tick
+      if age > TICK_INTERVAL && @last_tick.compare_and_swap(old_tick, new_tick)
+        required_ticks = age / TICK_INTERVAL
+        required_ticks.to_i.times do
+          tick
+        end
+      end
+    end
+
     def mark(val = 1)
+      tick_if_nessesary
       @count.update { |v| v + val }
       @m1_rate.update(val)
       @m5_rate.update(val)
@@ -46,14 +56,17 @@ module Metriks
     end
 
     def one_minute_rate
+      tick_if_nessesary
       @m1_rate.rate
     end
 
     def five_minute_rate
+      tick_if_nessesary
       @m5_rate.rate
     end
 
     def fifteen_minute_rate
+      tick_if_nessesary
       @m15_rate.rate
     end
 
@@ -61,13 +74,12 @@ module Metriks
       if count == 0
         return 0.0
       else
-        elapsed = Time.now - @start_time
+        elapsed = Time.now.to_f - @start_time
         count / elapsed
       end
     end
 
     def stop
-      @thread.kill
     end
   end
 end

data/lib/metriks.rb

@@ -1,6 +1,6 @@
 
 module Metriks
-  VERSION = '0.9.9.1'
+  VERSION = '0.9.9.2'
 
   def self.get(name)
     Metriks::Registry.default.get(name)

data/metriks.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks'
-  s.version           = '0.9.9.1'
-  s.date              = '2012-07-02'
+  s.version           = '0.9.9.2'
+  s.date              = '2012-10-23'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  - 1
-  version: 0.9.9.1
+  - 2
+  version: 0.9.9.2
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 -07:00
+date: 2012-10-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency