async 1.28.9 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca8ba4c610a65bfe25595780c26681ad5920a5423b8f065d12917df8db4144d
-  data.tar.gz: d5488881518a83750bf540a150e66dd63d993a88c30d5e6f839714456cd2709e
+  metadata.gz: 421b9e871d367ee3c769c4f7a9f3e51125d5e11c45d37f9d8c562a33ecce70ed
+  data.tar.gz: 868be7ef14d83fb04620c862d69b38e03f0b5ba036cd2d65e6caf0f45c58a689
 SHA512:
-  metadata.gz: 33200c36d76c0af962c8573da82962e1c32d83c74c3c98486b401ba366d2417d85afb6f7e70432bb4e667c9047a0d074afc308436b8f6c50af452f2269a4d6aa
-  data.tar.gz: be364fa61facbaeb3879945cd137499da161646cee5ceb4da31db12173f9b6fea4bbf8754b5aa076959e8b2a59778ba929724781aa32da18b01ce44c334e1ad4
+  metadata.gz: 47620eaf32dc53e1978f3c07ef66823c6aa4b3e85ec23ac3a207d1cdb39a06c790428a9b67dc3b955b74edf723faa567b2f8a077893ecf0c3d1383c5c62997e0
+  data.tar.gz: 74e3b0e17cc0d8f63bdc2c7e4aa40033062a07d2a5a1866f3ca3ac072376264463f8b11203485a07bbed11c475cbad6a2ac81f9297e900a732263f8b7b0b401b

data/lib/async/debug/monitor.rb

@@ -20,25 +20,23 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'delegate'
+
 module Async
 	module Debug
-		class Monitor
+		class Monitor < Delegator
 			def initialize(monitor, selector)
 				@monitor = monitor
 				@selector = selector
 			end
 			
-			def close
-				@selector.deregister(@monitor.io)
-				@monitor.close
+			def __getobj__
+				@monitor
 			end
 			
-			def method_missing(*arguments, &block)
-				@monitor.send(*arguments)
-			end
-			
-			def respond_to?(*arguments)
-				@monitor.respond_to?(*arguments)
+			def close
+				@selector.deregister(self)
+				@monitor.close
 			end
 			
 			def inspect

data/lib/async/debug/selector.rb

@@ -24,6 +24,7 @@ require_relative 'monitor'
 require_relative '../logger'
 
 require 'nio'
+require 'set'
 
 module Async
 	module Debug
@@ -36,7 +37,7 @@ module Async
 		class Selector
 			def initialize(selector = NIO::Selector.new)
 				@selector = selector
-				@monitors = {}
+				@monitors = Set.new
 			end
 			
 			def register(object, interests)
@@ -46,26 +47,18 @@ module Async
 					raise RuntimeError, "Could not convert #{io} into IO!"
 				end
 				
-				if monitor = @monitors[io.fileno]
-					raise RuntimeError, "Trying to register monitor for #{object.inspect} but it was already registered: #{monitor.inspect}!"
-				end
-				
 				monitor = Monitor.new(@selector.register(object, interests), self)
 				
-				@monitors[io.fileno] = monitor
+				@monitors.add(monitor)
 				
 				return monitor
 			end
 			
-			def deregister(object)
-				Async.logger.debug(self) {"Deregistering #{object.inspect}."}
-				
-				unless io = ::IO.try_convert(object)
-					raise RuntimeError, "Could not convert #{io} into IO!"
-				end
+			def deregister(monitor)
+				Async.logger.debug(self) {"Deregistering #{monitor.inspect}."}
 				
-				unless @monitors.delete(io.fileno)
-					raise RuntimeError, "Trying to remove monitor for #{io.inspect} but it was not registered!"
+				unless @monitors.delete?(monitor)
+					raise RuntimeError, "Trying to remove monitor for #{monitor.inspect} but it was not registered!"
 				end
 			end
 			
@@ -75,7 +68,7 @@ module Async
 			
 			def close
 				if @monitors.any?
-					raise LeakError, @monitors.values
+					raise LeakError, @monitors
 				end
 			ensure
 				@selector.close

data/lib/async/reactor.rb

@@ -47,9 +47,7 @@ module Async
 		# running.
 		def self.run(*arguments, **options, &block)
 			if current = Task.current?
-				reactor = current.reactor
-				
-				return reactor.async(*arguments, **options, &block)
+				return current.async(*arguments, **options, &block)
 			else
 				reactor = self.new
 				
@@ -96,6 +94,7 @@ module Async
 		end
 		
 		attr :scheduler
+		attr :logger
 		
 		# @reentrant Not thread safe.
 		def block(blocker, timeout)
@@ -135,10 +134,6 @@ module Async
 			end
 		end
 		
-		def logger
-			@logger || Console.logger
-		end
-		
 		def to_s
 			"\#<#{self.description} #{@children&.size || 0} children (#{stopped? ? 'stopped' : 'running'})>"
 		end
@@ -167,7 +162,7 @@ module Async
 			# - Avoid scheduler overhead if no blocking operation is performed.
 			task.run(*arguments)
 			
-			# logger.debug "Initial execution of task #{fiber} complete (#{result} -> #{fiber.alive?})..."
+			# Console.logger.debug "Initial execution of task #{fiber} complete (#{result} -> #{fiber.alive?})..."
 			return task
 		end
 		
@@ -210,7 +205,7 @@ module Async
 		# @param timeout [Float | nil] the maximum timeout, or if nil, indefinite.
 		# @return [Boolean] whether there is more work to do.
 		def run_once(timeout = nil)
-			# logger.debug(self) {"@ready = #{@ready} @running = #{@running}"}
+			# Console.logger.debug(self) {"@ready = #{@ready} @running = #{@running}"}
 			
 			if @ready.any?
 				# running used to correctly answer on `finished?`, and to reuse Array object.
@@ -258,7 +253,7 @@ module Async
 				interval = timeout
 			end
 			
-			# logger.info(self) {"Selecting with #{@children&.size} children with interval = #{interval ? interval.round(2) : 'infinite'}..."}
+			# Console.logger.info(self) {"Selecting with #{@children&.size} children with interval = #{interval ? interval.round(2) : 'infinite'}..."}
 			if monitors = @selector.select(interval)
 				monitors.each do |monitor|
 					monitor.value.resume
@@ -295,7 +290,7 @@ module Async
 			return initial_task
 		ensure
 			@scheduler&.clear!
-			logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
+			Console.logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
 		end
 		
 		def stop(later = true)

data/lib/async/task.rb

@@ -81,11 +81,13 @@ module Async
 			@result = nil
 			@finished = finished
 			
-			@logger = logger
+			@logger = logger || @parent.logger
 			
 			@fiber = make_fiber(&block)
 		end
 		
+		attr :logger
+		
 		if Fiber.current.respond_to?(:backtrace)
 			def backtrace(*arguments)
 				@fiber&.backtrace(*arguments)
@@ -96,10 +98,6 @@ module Async
 			"\#<#{self.description} (#{@status})>"
 		end
 		
-		def logger
-			@logger || Console.logger
-		end
-		
 		# @attr ios [Reactor] The reactor the task was created within.
 		attr :reactor
 		
@@ -242,9 +240,9 @@ module Async
 				raise
 			elsif @finished.nil?
 				# If no one has called wait, we log this as an error:
-				logger.error(self) {$!}
+				Console.logger.error(self) {$!}
 			else
-				logger.debug(self) {$!}
+				Console.logger.debug(self) {$!}
 			end
 		end
 		
@@ -264,7 +262,7 @@ module Async
 				begin
 					@result = yield(self, *arguments)
 					@status = :complete
-					# logger.debug(self) {"Task was completed with #{@children.size} children!"}
+					# Console.logger.debug(self) {"Task was completed with #{@children.size} children!"}
 				rescue Stop
 					stop!
 				rescue StandardError => error
@@ -272,7 +270,7 @@ module Async
 				rescue Exception => exception
 					fail!(exception, true)
 				ensure
-					# logger.debug(self) {"Task ensure $!=#{$!} with #{@children.size} children!"}
+					# Console.logger.debug(self) {"Task ensure $!=#{$!} with #{@children.size} children!"}
 					finish!
 				end
 			end

data/lib/async/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Async
-	VERSION = "1.28.9"
+	VERSION = "1.29.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.28.9
+  version: 1.29.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console