async 1.28.5 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b33ec5d0d22925d752f11766c464b87a53a32368b8325f80142fe82cb9237f4
-  data.tar.gz: 5bff146f715773a0e7f51e57f3879f71264e9b05beefaedaee8be8bc2022fd69
+  metadata.gz: 421b9e871d367ee3c769c4f7a9f3e51125d5e11c45d37f9d8c562a33ecce70ed
+  data.tar.gz: 868be7ef14d83fb04620c862d69b38e03f0b5ba036cd2d65e6caf0f45c58a689
 SHA512:
-  metadata.gz: 991a081bc1ca6f54b26f1d3e2e4f3d174fd18265161722d5e220c65dad1215eefb51bb9e511b1a0b16c1b1a89f2189f9284c3eec089d2091a858623ef4d64b82
-  data.tar.gz: 2d00555269320cd962d2b6993ed73b706f896467e2259fe20777d1035c7ab13bc904e53ff33ee8f83416b532db5f9fa0efcd00f7efe9b001e9c51e7688ba706e
+  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/node.rb

@@ -24,6 +24,7 @@ module Async
 	# A double linked list.
 	class List
 		def initialize
+			# The list behaves like a list node, so @tail points to the next item (the first one) and head points to the previous item (the last one). This may be slightly confusing but it makes the interface more natural.
 			@head = nil
 			@tail = nil
 			@size = 0
@@ -36,21 +37,21 @@ module Async
 		
 		# Inserts an item at the end of the list.
 		def insert(item)
-			unless @head
-				@head = item
+			unless @tail
 				@tail = item
+				@head = item
 				
 				# Consistency:
 				item.head = nil
 				item.tail = nil
 			else
-				@tail.tail = item
-				item.head = @tail
+				@head.tail = item
+				item.head = @head
 				
 				# Consistency:
 				item.tail = nil
 				
-				@tail = item
+				@head = item
 			end
 			
 			@size += 1
@@ -59,14 +60,14 @@ module Async
 		end
 		
 		def delete(item)
-			if @head.equal?(item)
-				@head = @head.tail
+			if @tail.equal?(item)
+				@tail = @tail.tail
 			else
 				item.head.tail = item.tail
 			end
 			
-			if @tail.equal?(item)
-				@tail = @tail.head
+			if @head.equal?(item)
+				@head = @head.head
 			else
 				item.tail.head = item.head
 			end
@@ -79,15 +80,17 @@ module Async
 			return self
 		end
 		
-		def each
+		def each(&block)
 			return to_enum unless block_given?
 			
-			item = @head
-			while item
-				# We store the tail pointer so we can remove the current item from the linked list:
-				tail = item.tail
-				yield item
-				item = tail
+			current = self
+			while node = current.tail
+				yield node
+				
+				# If the node has deleted itself or any subsequent node, it will no longer be the next node, so don't use it for continued traversal:
+				if current.tail.equal?(node)
+					current = node
+				end
 			end
 		end
 		
@@ -100,19 +103,19 @@ module Async
 		end
 		
 		def first
-			@head
+			@tail
 		end
 		
 		def last
-			@tail
+			@head
 		end
 		
 		def empty?
-			@head.nil?
+			@tail.nil?
 		end
 		
 		def nil?
-			@head.nil?
+			@tail.nil?
 		end
 	end
 	
@@ -276,6 +279,8 @@ module Async
 						if child.finished?
 							delete_child(child)
 						else
+							# In theory we don't need to do this... because we are throwing away the list. However, if you don't correctly update the list when moving the child to the parent, it foobars the enumeration, and subsequent nodes will be skipped, or in the worst case you might start enumerating the parents nodes.
+							delete_child(child)
 							parent.add_child(child)
 						end
 					end

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)
@@ -111,7 +110,7 @@ module Async
 			
 			begin
 				@blocked += 1
-				Fiber.yield
+				Task.yield
 			ensure
 				@blocked -= 1
 			end
@@ -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
 		
@@ -198,7 +193,7 @@ module Async
 		def yield(fiber = Fiber.current)
 			@ready << fiber
 			
-			Fiber.yield
+			Task.yield
 		end
 		
 		def finished?
@@ -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.
@@ -223,7 +218,7 @@ module Async
 				@running.clear
 			end
 			
-			unless @blocked.zero?
+			if @unblocked.any?
 				unblocked = Array.new
 				
 				@guard.synchronize do
@@ -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)
@@ -347,7 +342,7 @@ module Async
 			timer = @timers.after(timeout) do
 				if fiber.alive?
 					error = exception.new("execution expired")
-					fiber.resume error
+					fiber.resume(error)
 				end
 			end
 			

data/lib/async/scheduler.rb

@@ -34,24 +34,20 @@ module Async
 		
 		def initialize(reactor)
 			@reactor = reactor
-			@wrappers = nil
 		end
 		
+		attr :wrappers
+		
 		def set!
-			@wrappers = {}
 			Fiber.set_scheduler(self)
 		end
 		
 		def clear!
-			# Because these instances are created with `autoclose: false`, this does not close the underlying file descriptor:
-			# @ios&.each_value(&:close)
-			
-			@wrappers = nil
 			Fiber.set_scheduler(nil)
 		end
 		
 		private def from_io(io)
-			@wrappers[io] ||= Wrapper.new(io, @reactor)
+			Wrapper.new(io, @reactor)
 		end
 		
 		def io_wait(io, events, timeout = nil)
@@ -72,6 +68,8 @@ module Async
 			end
 			
 			return false
+		rescue TimeoutError
+			return nil
 		ensure
 			wrapper.reactor = nil
 		end

data/lib/async/task.rb

@@ -72,20 +72,22 @@ module Async
 		# Create a new task.
 		# @param reactor [Async::Reactor] the reactor this task will run within.
 		# @param parent [Async::Task] the parent task.
-		def initialize(reactor, parent = Task.current?, logger: nil, **options, &block)
+		def initialize(reactor, parent = Task.current?, logger: nil, finished: nil, **options, &block)
 			super(parent || reactor, **options)
 			
 			@reactor = reactor
 			
 			@status = :initialized
 			@result = nil
-			@finished = 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.5"
+	VERSION = "1.29.0"
 end

data/lib/kernel/sync.rb

@@ -28,7 +28,10 @@ module Kernel
 		if task = ::Async::Task.current?
 			yield task
 		else
-			::Async::Reactor.run(&block).wait
+			::Async::Reactor.run(
+				finished: ::Async::Condition.new,
+				&block
+			).wait
 		end
 	end
 end

metadata

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