frugal_timeout 0.0.5 → 0.0.6

data/lib/frugal_timeout.rb

@@ -29,11 +29,11 @@ require 'timeout'
 #--
 # }}}1
 module FrugalTimeout
-  # {{{2 Error
-  class Error < Timeout::Error; end
+  # {{{1 Error
+  class Error < Timeout::Error; end # :nodoc:
 
-  # {{{2 Request
-  class Request
+  # {{{1 Request
+  class Request # :nodoc:
     include Comparable
     @@mutex = Mutex.new
 
@@ -60,10 +60,43 @@ module FrugalTimeout
     end
   end
 
-  # {{{2 Main code
+  # {{{1 SleeperNotifier
+  class SleeperNotifier # :nodoc:
+    def initialize notifyQueue
+      @notifyQueue = notifyQueue
+      @delays, @mutex = Queue.new, Mutex.new
+
+      @thread = Thread.new {
+	loop {
+	  sleepFor = nil
+	  @mutex.synchronize {
+	    sleepFor = @delays.shift until @delays.empty?
+	  }
+	  start = Time.now
+	  sleepFor ? sleep(sleepFor) : sleep
+	  @mutex.synchronize {
+	    @notifyQueue.push :expired \
+	      if sleepFor && Time.now - start >= sleepFor
+	  }
+	}
+      }
+      ObjectSpace.define_finalizer self, proc { @thread.kill }
+    end
+
+    def notifyAfter sec
+      @mutex.synchronize {
+	sleep 0.01 until @thread.status == 'sleep'
+	@delays.push sec
+	@thread.wakeup
+      }
+    end
+  end
+
+  # {{{1 Main code
   @in = Queue.new
+  @sleeper = SleeperNotifier.new @in
 
-  # {{{3 Timeout request and expiration processing thread
+  # {{{2 Timeout request and expiration processing thread
   Thread.new {
     nearestTimeout, requests = nil, []
     loop {
@@ -85,7 +118,7 @@ module FrugalTimeout
 	nearestTimeout = unless requests.first
 	  nil
 	else
-	  setupSleeper requests.first.at - now
+	  @sleeper.notifyAfter requests.first.at - now
 	  requests.first.at
 	end
 
@@ -104,28 +137,13 @@ module FrugalTimeout
       requests << request
       next if nearestTimeout && request.at > nearestTimeout
 
-      setupSleeper request.at - now
+      @sleeper.notifyAfter request.at - now
       nearestTimeout = request.at
     }
   }
 
-  # {{{3 Closest expiration notifier thread
-  @sleeperDelays, @sleeperMutex = Queue.new, Mutex.new
-  @sleeper = Thread.new {
-    loop {
-      sleepFor = nil
-      @sleeperMutex.synchronize {
-	sleepFor = @sleeperDelays.shift until @sleeperDelays.empty?
-      }
-      start = Time.now
-      sleepFor ? sleep(sleepFor) : sleep
-      @sleeperMutex.synchronize {
-	@in.push :expired if sleepFor && Time.now - start >= sleepFor
-      }
-    }
-  }
 
-  # {{{3 Methods
+  # {{{2 Methods
 
   # Ensure that calling timeout() will use FrugalTimeout.timeout()
   def self.dropin!
@@ -135,22 +153,16 @@ module FrugalTimeout
        end'
   end
 
-  def self.setupSleeper sleepFor # :nodoc:
-    @sleeperMutex.synchronize {
-      sleep 0.1 until @sleeper.status == 'sleep'
-      @sleeperDelays.push sleepFor
-      @sleeper.wakeup
-    }
-  end
-
   # Same as Timeout.timeout()
-  def self.timeout t, klass=nil
-    @in.push request = Request.new(Thread.current, Time.now + t, klass)
+  def self.timeout sec, klass=nil
+    return yield sec if sec == nil || sec <= 0
+
+    @in.push request = Request.new(Thread.current, Time.now + sec, klass)
     begin
-      yield t
+      yield sec
     ensure
       request.done! unless $!.is_a? FrugalTimeout::Error
     end
   end
-  # }}}2
+  # }}}1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frugal_timeout
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec