async 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd2107a53d168c8c2d2cd1361d66d8f05df65ba0736b131ce718a17c3607bac
-  data.tar.gz: 22872f2281ebc86ab5652cd53ca050d2470723d10820de8f90c2cde7a0513557
+  metadata.gz: f19a934a9510bb56c88e54ac305707a0cd68d5a74f925e56a2f6ca69c5a0bab9
+  data.tar.gz: 8c68511531f459a2c067550f369e9253d7c93064f054a08780a11f357d68a942
 SHA512:
-  metadata.gz: cc961f8e16a6e5713c6bfe64593ad4877fc5522476e813481b51a5f9dfec272b163d7828ddb6360c37c0696be021535a61e371816338c83fdb85d9eb4dfa07c7
-  data.tar.gz: 61362063d6dfe7162bb1f9f1c7d396513b6042a8e64acac831928b0c0849a6564ab4aeccb4c4b0cb47801255e143876a5ef4f7f8cb5b8fb3a870c06e1a70311c
+  metadata.gz: e1387cc04e3d358d9b39dc5f2fb59e457b173f04b3381c603a11d495f987f29c41753c6addae55fcb203e6e1a3f96bf929e45cafddf624fd374fc85b6bc8e33f
+  data.tar.gz: e76e0e5dc3c67f6d77209f501a58ca1c97dbc8f96d40081ec55d082e0f0be63e7ecd344ba4adfcbaadcc910590d1abdf4a4eab0bd4a0ab8310f5afbe5a55db7d

data/async.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = ">= 2.2.7"
 
-	spec.add_runtime_dependency "nio4r", "~> 2.0"
+	spec.add_runtime_dependency "nio4r", "~> 2.3"
 	spec.add_runtime_dependency "timers", "~> 4.1"
 	
 	spec.add_development_dependency "async-rspec", "~> 1.1"

data/lib/async/debug.rb

@@ -0,0 +1,86 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'nio'
+
+module Async
+	class DebugSelector
+		class MonitorProxy
+			def initialize(monitor, selector)
+				@monitor = monitor
+				@selector = selector
+			end
+			
+			def close
+				@selector.deregister(@monitor.io)
+				@monitor.close
+			end
+			
+			def method_missing(*args, &block)
+				@monitor.send(*args)
+			end
+			
+			def respond_to?(*args)
+				@monitor.respond_to?(*args)
+			end
+		end
+		
+		def initialize(selector)
+			@selector = selector
+			@monitors = {}
+		end
+		
+		def register(io, interests)
+			$stderr.puts "Registering #{io.inspect} for #{interests}."
+			
+			if monitor = @monitors[io.fileno]
+				raise RuntimeError, "Trying to register monitor for #{io.inspect} but it was already registered as #{monitor.io.inspect}!"
+			end
+			
+			@monitors[io.fileno] = io
+			
+			MonitorProxy.new(@selector.register(io, interests), self)
+		end
+		
+		def deregister(io)
+			$stderr.puts "Deregistering #{io.inspect}."
+			
+			unless @monitors.delete(io.fileno)
+				raise RuntimeError, "Trying to remove monitor for #{io.inspect} but it was not registered!"
+			end
+		end
+		
+		def wakeup
+			@selector.wakeup
+		end
+		
+		def close
+			if @monitors.any?
+				$stderr.puts "Trying to close selector with active monitors: #{@monitors.values.inspect}!"
+			end
+			
+			@selector.close
+		end
+		
+		def select(*args)
+			@selector.select(*args)
+		end
+	end
+end

data/lib/async/reactor.rb

@@ -30,7 +30,17 @@ module Async
 	# Raised if a timeout occurs on a specific Fiber. Handled gracefully by {Task}.
 	class TimeoutError < RuntimeError
 	end
-
+	
+	class MonitorError < RuntimeError
+		def initialize(monitor)
+			super "Event detected on IO #{monitor.io.inspect} (#{monitor.interests} -> #{monitor.readiness}) without corresponding fiber!"
+			
+			@monitor = monitor
+		end
+		
+		attr :monitor
+	end
+	
 	# An asynchronous, cooperatively scheduled event reactor.
 	class Reactor < Node
 		extend Forwardable
@@ -165,20 +175,21 @@ module Async
 					interval = 0
 				end
 				
-				# Async.logger.debug{"[#{self} Pre] Updating #{@children.count} children..."}
+				# Async.logger.debug(self) {"Updating #{@children.count} children..."}
 				# As timeouts may have been updated, and caused fibers to complete, we should check this.
 				
 				# If there is nothing to do, then finish:
-				# Async.logger.debug{"[#{self}] @children.empty? = #{@children.empty?} && interval #{interval.inspect}"}
 				if !interval && self.finished?
 					return initial_task
 				end
 				
-				# Async.logger.debug{"Selecting with #{@children.count} fibers interval = #{interval.inspect}..."}
+				# Async.logger.debug(self) {"Selecting with #{@children.count} fibers interval = #{interval.inspect}..."}
 				if monitors = @selector.select(interval)
 					monitors.each do |monitor|
 						if fiber = monitor.value
 							fiber.resume # if fiber.alive?
+						else
+							raise MonitorError.new(monitor)
 						end
 					end
 				end

data/lib/async/version.rb

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

data/lib/async/wrapper.rb

@@ -42,10 +42,12 @@ module Async
 		# Bind this wrapper to a different reactor. Assign nil to convert to an unbound wrapper (can be used from any reactor/task but with slightly increased overhead.)
 		# Binding to a reactor is purely a performance consideration. Generally, I don't like APIs that exist only due to optimisations. This is borderline, so consider this functionality semi-private.
 		def reactor= reactor
-			@monitor.close if @monitor
+			if @monitor
+				@monitor.close 
+				@monitor = nil
+			end
 			
 			@reactor = reactor
-			@monitor = nil
 		end
 		
 		# Wait for the io to become readable.
@@ -74,8 +76,7 @@ module Async
 				begin
 					wait_for(@reactor, @monitor, duration)
 				ensure
-					@monitor.remove_interest(@monitor.interests)
-					@monitor.value = nil
+					@monitor.interests = nil
 				end
 			else
 				reactor = Task.current.reactor
@@ -91,7 +92,10 @@ module Async
 		
 		# Close the io and monitor.
 		def close
-			@monitor.close if @monitor
+			if @monitor
+				@monitor.close 
+				@monitor = nil
+			end
 			
 			@io.close
 		end

data/spec/async/performance_spec.rb

@@ -19,6 +19,8 @@ RSpec.describe Async::Wrapper do
 						input.wait_readable
 						input.io.read(1)
 					end
+					
+					input.reactor = nil
 				end
 			end
 			

data/spec/async/wrapper_spec.rb

@@ -46,6 +46,24 @@ RSpec.describe Async::Wrapper do
 			input.close
 			output.close
 		end
+		
+		it "can wait for readability in multiple tasks" do
+			reactor.async do
+				input.wait_writable(1)
+				input.io.write('Hello World')
+			end
+			
+			output.reactor = reactor
+			
+			2.times do
+				reactor.async do
+					expect(output.wait_readable(1)).to be_truthy
+				end.wait
+			end
+			
+			input.close
+			output.close
+		end
 	end
 	
 	describe '#reactor=' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: timers
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/async.rb
 - lib/async/clock.rb
 - lib/async/condition.rb
+- lib/async/debug.rb
 - lib/async/logger.rb
 - lib/async/measure.rb
 - lib/async/node.rb