async 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f42d14b27e2c7835cd745cae1e3fed8cea3ab36e4e919676b38673fc8adf32
-  data.tar.gz: 8944fd0464f0f1ef8135440bf4caa5a0235a0ef03de5e115609794c2a880ef76
+  metadata.gz: 44eb7af07e00729f3e1ecc10e98cd7cda6d09a117a9d3f62e33a22d5fc7068b4
+  data.tar.gz: 115e88de10b11bb887b3a17c1c82f29d9ea1d082e13ac874e5311c37cfc7cdaf
 SHA512:
-  metadata.gz: 3843d40191f22c646adfd596bb0360431dcca7152127fb90154932b430d2cbcee4e6a6479b804b34ebceef0b92535bf46d7c856a0c3aed6c3b9843c5973c2a09
-  data.tar.gz: cc595c9163bf0819bdb5f2029685bc4839faa569f88cb6cb969662d89732f2a0c25da0f7b78f297eb061e4c54d68e50ae6a5ed079a13a781f846cfee47edcea6
+  metadata.gz: 7a48d12ecd04670b4d552772bf882c190230aa15cb1946f0558d46f3bf9b50d321d160128d2667db57b6531af26ca01a68457754c40b9aa91135bfb63d36e983
+  data.tar.gz: b56e6e3e0ccf58fd47f70f99209badf9c536430ffe3d8fac7f4f6694670c06d2e4861e61f87d4767822a01264b1b0ad5fede8ab23e8d35a9a4d5cdc8ba6cc537

data/lib/async/reactor.rb

@@ -131,6 +131,10 @@ module Async
 			Fiber.yield
 		end
 		
+		def finished?
+			super && @ready.empty?
+		end
+		
 		# Run the reactor until either all tasks complete or {#stop} is invoked.
 		# Proxies arguments to {#async} immediately before entering the loop.
 		def run(*args, &block)
@@ -142,22 +146,33 @@ module Async
 			initial_task = async(*args, &block) if block_given?
 			
 			@timers.wait do |interval|
+				if @ready.any?
+					@ready.each do |fiber|
+						fiber.resume if fiber.alive?
+					end
+					
+					@ready.clear
+					
+					# The above tasks may schedule, cancel or affect timers in some way. We need to compute a new wait interval for the blocking selector call below:
+					interval = @timers.wait_interval
+				end
+				
 				# - nil: no timers
 				# - -ve: timers expired already
 				# -   0: timers ready to fire
 				# - +ve: timers waiting to fire
-				interval = 0 if interval && interval < 0
+				if interval && interval < 0
+					interval = 0
+				end
 				
 				# Async.logger.debug{"[#{self} Pre] Updating #{@children.count} children..."}
 				# As timeouts may have been updated, and caused fibers to complete, we should check this.
 				
-				@ready.each do |fiber|
-					fiber.resume if fiber.alive?
-				end; @ready.clear
-				
 				# If there is nothing to do, then finish:
 				# Async.logger.debug{"[#{self}] @children.empty? = #{@children.empty?} && interval #{interval.inspect}"}
-				return initial_task if @children.empty? && interval.nil?
+				if !interval && self.finished?
+					return initial_task
+				end
 				
 				# Async.logger.debug{"Selecting with #{@children.count} fibers interval = #{interval.inspect}..."}
 				if monitors = @selector.select(interval)
@@ -171,7 +186,7 @@ module Async
 			
 			return initial_task
 		ensure
-			Async.logger.debug{"[#{self} Ensure] Exiting run-loop (stopped: #{@stopped} exception: #{$!.inspect})..."}
+			Async.logger.debug(self) {"Exiting run-loop because #{$! ? $!.inspect : 'finished'}."}
 			@stopped = true
 		end
 	

data/lib/async/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Async
-	VERSION = "1.4.0"
+	VERSION = "1.4.1"
 end

data/spec/async/performance_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Async::Wrapper do
 	let(:input) {described_class.new(pipe.first)}
 	let(:output) {described_class.new(pipe.last)}
 		
-	it "should be fast to parse large documents" do
+	it "should be fast to wait until readable" do
 		Benchmark.ips do |x|
 			x.report('Wrapper#wait_readable') do |repeats|
 				Async::Reactor.run do |task|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r