async 1.28.8 → 1.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bfd6d656f9d5f891985de61ab428bafe452148e85cdc9d3ff43deec90e17f5e
-  data.tar.gz: 4c402e7fb08a04356ae96672598e5c196774bdc0c95462d6f32620796977cd64
+  metadata.gz: 3613e4f3c3948bdf49fba954cca2f5df7934c52773dc533c424485aebaf800d6
+  data.tar.gz: ef790cb3bf5bb3bd248cbae57917f8a1598ffb94acef79a024e3d786e663f3ff
 SHA512:
-  metadata.gz: 96b328f71cd892be4d9ecb677911054dad649b2e1115d5c6a92aa6c616295e66c969d964b3127797c9209f38cdb44962e364e4d8a0462e14d5da13bf51b1c4a5
-  data.tar.gz: 919265a3a3c5a8a1e512548860fb8a37641016c0a25f7322330f2560f651a1991144c632ef12c8e87410810f8fe2e42df67a9a5a7c98965e37f414ad515baddb
+  metadata.gz: 99f619c7c76e7767b49ba8ff67e243a015b7a9f981df347ed4271c4bfafa1a465822293d177d42fd7e2ea184a628579853c233e060522e4a4f388c201a26ae12
+  data.tar.gz: 28046633dc2f14dae25828666cf611b9bd8d96fdaa140fc66126b4a3b48030d8811fd1081e4c9ecc46288eaa7b5d962a0845e54a81873b47bc9d3407c9f3b0a1

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/node.rb

@@ -302,8 +302,31 @@ module Async
 			end
 		end
 		
-		def stop
-			@children&.each(&:stop)
+		# Immediately terminate all children tasks, including transient tasks.
+		# Internally invokes `stop(false)` on all children.
+		def terminate
+			# Attempt to stop the current task immediately, and all children:
+			stop(false)
+			
+			# If that doesn't work, take more serious action:
+			@children&.each do |child|
+				child.terminate
+			end
+		end
+		
+		# Attempt to stop the current node immediately, including all non-transient children.
+		# Invokes {#stop_children} to stop all children.
+		# @parameter later [Boolean] Whether to defer stopping until some point in the future.
+		def stop(later = false)
+			# The implementation of this method may defer calling `stop_children`.
+			stop_children(later)
+		end
+		
+		# Attempt to stop all non-transient children.
+		private def stop_children(later = false)
+			@children&.each do |child|
+				child.stop(later) unless child.transient?
+			end
 		end
 		
 		def print_hierarchy(out = $stdout, backtrace: true)

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,35 +290,26 @@ module Async
 			return initial_task
 		ensure
 			@scheduler&.clear!
-			logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
-		end
-		
-		def stop(later = true)
-			@children&.each do |child|
-				# We don't want this process to propagate `Async::Stop` exceptions, so we schedule tasks to stop later.
-				child.stop(later)
-			end
+			Console.logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
 		end
 		
 		# Stop each of the children tasks and close the selector.
-		# 
-		# @return [void]
 		def close
-			# This is a critical step. Because tasks could be stored as instance variables, and since the reactor is (probably) going out of scope, we need to ensure they are stopped. Otherwise, the tasks will belong to a reactor that will never run again and are not stopped.
-			self.stop(false)
+			# This is a critical step. Because tasks could be stored as instance variables, and since the reactor is (probably) going out of scope, we need to ensure they are stopped. Otherwise, the tasks will belong to a reactor that will never run again and are not stopped:
+			self.terminate
 			
 			@selector.close
 			@selector = nil
 		end
 		
 		# Check if the selector has been closed.
-		# @return [Boolean]
+		# @returns [Boolean]
 		def closed?
 			@selector.nil?
 		end
 		
 		# Put the calling fiber to sleep for a given ammount of time.
-		# @param duration [Numeric] The time in seconds, to sleep for.
+		# @parameter duration [Numeric] The time in seconds, to sleep for.
 		def sleep(duration)
 			fiber = Fiber.current
 			

data/lib/async/scheduler.rb

@@ -68,8 +68,10 @@ module Async
 			end
 			
 			return false
+		rescue TimeoutError
+			return nil
 		ensure
-			wrapper.reactor = nil
+			wrapper&.reactor = nil
 		end
 		
 		# Wait for the specified process ID to exit.

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
 		
@@ -158,7 +156,6 @@ module Async
 		# Soon to become attr :result
 		
 		# Stop the task and all of its children.
-		# @return [void]
 		def stop(later = false)
 			if self.stopped?
 				# If we already stopped this task... don't try to stop it again:
@@ -242,9 +239,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
 		
@@ -252,9 +249,7 @@ module Async
 			# logger.debug(self) {"Task was stopped with #{@children&.size.inspect} children!"}
 			@status = :stopped
 			
-			@children&.each do |child|
-				child.stop(true)
-			end
+			stop_children(true)
 		end
 		
 		def make_fiber(&block)
@@ -264,7 +259,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 +267,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.8"
+	VERSION = "1.29.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.28.8
+  version: 1.29.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A concurrency framework for Ruby.