frugal_timeout 0.0.10 → 0.0.11

data/frugal_timeout.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'frugal_timeout'
-  s.version     = '0.0.10'
-  s.date        = '2014-01-02'
+  s.version     = '0.0.11'
+  s.date        = '2014-01-03'
   s.summary     = 'Timeout.timeout replacement'
   s.description = 'Timeout.timeout replacement that uses only 1 thread'
   s.authors     = ['Dmitry Maksyoma']

data/lib/frugal_timeout.rb

@@ -77,7 +77,10 @@ module FrugalTimeout
 
     def enforceTimeout
       @@mutex.synchronize {
-	@thread.raise @klass, 'execution expired' unless @defused
+	return if @defused
+
+	@thread.raise @klass, 'execution expired'
+	true
       }
     end
   end
@@ -97,6 +100,10 @@ module FrugalTimeout
     end
     private :defuse_thread!
 
+    def onEnforce &b
+      @onEnforce = b
+    end
+
     def onNewNearestRequest &b
       @onNewNearestRequest = b
     end
@@ -104,14 +111,17 @@ module FrugalTimeout
     # Purge and enforce expired timeouts. Only enforce once for each thread,
     # even if multiple timeouts for that thread expire at once.
     def purgeExpired
-      expiredRequests, filter, now = nil, {}, MonotonicTime.now
+      filter, now = {}, MonotonicTime.now
       @requests.synchronize {
+	@onEnforce.call if @onEnforce
+
 	@requests.reject_and_get! { |r| r.at <= now }.each { |r|
 	  next if filter[r.thread]
 
-	  r.enforceTimeout
-	  defuse_thread! r.thread
-	  filter[r.thread] = true
+	  if r.enforceTimeout
+	    defuse_thread! r.thread
+	    filter[r.thread] = true
+	  end
 	}
 
 	# It's necessary to call onNewNearestRequest inside synchronize as other
@@ -292,6 +302,10 @@ module FrugalTimeout
        end'
   end
 
+  def self.on_enforce &b #:nodoc:
+    @requestQueue.onEnforce &b
+  end
+
   def self.on_ensure &b #:nodoc:
     @onEnsure = b
   end

data/spec/frugal_timeout_spec.rb

@@ -122,6 +122,17 @@ describe FrugalTimeout do
       }.to raise_error Timeout::Error
     end
 
+    it 'raises exception if inner timeout is defused before it is enforced' do
+      expect {
+	timeout(0.05, IOError) {
+	  FrugalTimeout.on_enforce { sleep 0.02 }
+	  timeout(0.01) { }
+	  FrugalTimeout.on_enforce
+	  sleep 0.06
+	}
+      }.to raise_error IOError
+    end
+
     context "doesn't raise second exception in the same thread" do
       before :all do
 	FrugalTimeout.on_ensure { sleep 0.02 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frugal_timeout
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec