ztimer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f141e0e904b09ba4e9479dfaa3a0ec47ed48ee3
-  data.tar.gz: 6c3ecec2bac2dd388b4eee8154187f14836cae22
+  metadata.gz: 121c5eba1e94fd6be30153011569eda98500a497
+  data.tar.gz: 084133c7d9e7ab4dad366c21107d494aa452f20b
 SHA512:
-  metadata.gz: cc01e57fc11a70e3927f5643f0c639654d75c6f1bcea8aa6a56ca3f185a22476177430e1cc3098020c129900b8b516c3760aebf52edbaf57b8e72149139abf66
-  data.tar.gz: 017113396491866580b63ae0242ffbe2085427b1c55e2c45dfc0a5233f11b5f08e015c0e0006a931b39ac49536e564d72018ef148ca3594a78c37c7181f3521f
+  metadata.gz: 878684872b565c899f5963970fad9604057f769864f1ffee747612a471d7b2029081463b66c8d0c9ad3c668409056c64853b60e03c974b4dd108ae198d7b87f0
+  data.tar.gz: 5fe4d73a56bf09c3ea73d6be5c0eed9620a19509f5914f79b1624ec658ee882c5c24882b2b4dd130182e9d8056b9d881454222fc6b7a279cab2ad33f5de2ff48

data/lib/ztimer/version.rb

@@ -1,3 +1,3 @@
 module Ztimer
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/ztimer/watcher.rb

@@ -4,11 +4,9 @@ module Ztimer
 
     def initialize(&callback)
       @thread   = nil
-      @idler    = Lounger.new
       @slots    = Ztimer::SortedStore.new
       @callback = callback
       @lock     = Mutex.new
-      @metric   = Hitimes::Metric.new("Notifier")
       @mutex    = Mutex.new
     end
 
@@ -29,7 +27,8 @@ module Ztimer
 
     def run
       if @thread
-        @idler.signal && @thread.run
+        @thread.wakeup
+        @thread.run
       else
         start
       end
@@ -40,15 +39,19 @@ module Ztimer
         return if @thread
         @thread = Thread.new do
           loop do
-            delay = get_delay
-            if delay.nil?
-              @idler.wait
-              next
-            end
+            begin
+              delay = get_delay
+              if delay.nil?
+                Thread.stop
+                next
+              end
 
-            select(nil, nil, nil, delay / 1_000_000.to_f) if delay > 1 # 1 microsecond of cranularity
+              select(nil, nil, nil, delay / 1_000_000.to_f) if delay > 1 # 1 microsecond of cranularity
 
-            while get_first_expired do
+              while get_first_expired do
+              end
+            rescue => e
+              puts e.inspect + "\n" + e.backtrace.join("\n")
             end
           end
         end
@@ -57,15 +60,15 @@ module Ztimer
     end
 
     def get_delay
-      return @mutex.synchronize { @slots.empty? ? nil : @slots.first.expires_at - @metric.utc_microseconds }
+      return @mutex.synchronize { @slots.empty? ? nil : @slots.first.expires_at - utc_microseconds }
     end
 
     def get_first_expired
       @mutex.synchronize do
         slot = @slots.first
-        if slot && (slot.expires_at < @metric.utc_microseconds)
+        if slot && (slot.expires_at < utc_microseconds)
           @slots.shift
-          slot.started_at = @metric.utc_microseconds
+          slot.started_at = utc_microseconds
           unless slot.canceled?
             execute(slot)
             if slot.recurrent?
@@ -84,5 +87,9 @@ module Ztimer
     def execute(slot)
       @callback.call(slot)
     end
+
+    def utc_microseconds
+      return Time.now.to_f * 1_000_000
+    end
   end
 end

data/lib/ztimer.rb

@@ -1,7 +1,3 @@
-require 'set'
-require 'hitimes'
-require 'lounger'
-
 require "ztimer/version"
 require "ztimer/slot"
 require "ztimer/sorted_store"
@@ -10,7 +6,6 @@ require "ztimer/watcher"
 module Ztimer
   @concurrency  = 20
   @watcher      = Ztimer::Watcher.new(){|slot| execute(slot) }
-  @metric       = Hitimes::Metric.new("Notifier")
   @workers_lock = Mutex.new
   @queue        = Queue.new
   @running      = 0
@@ -20,7 +15,7 @@ module Ztimer
     attr_reader :concurrency, :running, :count
 
     def after(milliseconds, &callback)
-      enqueued_at = @metric.utc_microseconds
+      enqueued_at = utc_microseconds
       expires_at  = enqueued_at + milliseconds * 1000
       slot        = Slot.new(enqueued_at, expires_at, -1, &callback)
 
@@ -65,7 +60,7 @@ module Ztimer
           worker = Thread.new do
             begin
               while !@queue.empty? && @queue.pop(true) do
-                slot.executed_at = @metric.utc_microseconds
+                slot.executed_at = utc_microseconds
                 slot.callback.call(slot) unless slot.callback.nil?
               end
             rescue ThreadError
@@ -80,5 +75,9 @@ module Ztimer
         end
       end
     end
+
+    def utc_microseconds
+      return Time.now.to_f * 1_000_000
+    end
   end
 end

data/ztimer.gemspec

@@ -22,6 +22,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake",    "~> 10.0"
   spec.add_development_dependency "rspec",   "~> 3.0"
-  spec.add_dependency             "hitimes", "~> 1.2"
-  spec.add_dependency             "lounger", "~> 0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztimer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: hitimes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: lounger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 description: Ruby asyncrhonous timer that allows you to enqueue tasks to be executed
   asyncrhonously after a delay
 email:
@@ -123,8 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An asyncrhonous timer
 test_files: []
+has_rdoc: