frugal_timeout 0.0.11 → 0.0.12

data/frugal_timeout.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'frugal_timeout'
-  s.version     = '0.0.11'
+  s.version     = '0.0.12'
   s.date        = '2014-01-03'
   s.summary     = 'Timeout.timeout replacement'
   s.description = 'Timeout.timeout replacement that uses only 1 thread'

data/lib/frugal_timeout.rb

@@ -92,11 +92,15 @@ module FrugalTimeout
     def_delegators :@requests, :empty?, :first, :<<
 
     def initialize
-      @onNewNearestRequest, @requests = proc {}, SortedQueue.new
+      @onNewNearestRequest, @requests, @threadReq =
+	proc {}, SortedQueue.new, {}
     end
 
     def defuse_thread! thread
-      @requests.each { |r| r.defuse! if r.thread == thread }
+      @requests.synchronize {
+	stored = @threadReq.delete thread
+	stored.each { |r| r.defuse! } if stored.is_a? Array
+      }
     end
     private :defuse_thread!
 
@@ -130,11 +134,26 @@ module FrugalTimeout
       }
     end
 
+    def storeInIndex request
+      unless stored = @threadReq[request.thread]
+	@threadReq[request.thread] = request
+	return
+      end
+
+      if stored.is_a? Array
+	stored << request
+      else
+	@threadReq[request.thread] = [stored, request]
+      end
+    end
+    private :storeInIndex
+
     def queue sec, klass
       @requests.synchronize {
 	@requests << (request = Request.new(Thread.current,
 	  MonotonicTime.now + sec, klass))
 	@onNewNearestRequest.call(request) if @requests.first == request
+	storeInIndex request
 	request
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frugal_timeout
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: