async 1.29.0 → 1.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421b9e871d367ee3c769c4f7a9f3e51125d5e11c45d37f9d8c562a33ecce70ed
-  data.tar.gz: 868be7ef14d83fb04620c862d69b38e03f0b5ba036cd2d65e6caf0f45c58a689
+  metadata.gz: f8503897fe2c8f3b9593655310b259ee33d2a3774e65d7882524289286cea163
+  data.tar.gz: 952c6d1fd722b83efb95ffc3e4153c87d5925359aa403235f63496f984699588
 SHA512:
-  metadata.gz: 47620eaf32dc53e1978f3c07ef66823c6aa4b3e85ec23ac3a207d1cdb39a06c790428a9b67dc3b955b74edf723faa567b2f8a077893ecf0c3d1383c5c62997e0
-  data.tar.gz: 74e3b0e17cc0d8f63bdc2c7e4aa40033062a07d2a5a1866f3ca3ac072376264463f8b11203485a07bbed11c475cbad6a2ac81f9297e900a732263f8b7b0b401b
+  metadata.gz: 7b6c1a440279e389c4750ac7b7b716d19f05e31b29c67e3b712692b54877dca265eff31994d9a9220a1be7fa44fc79622f244a188e470e46f4a52b343e8b7638
+  data.tar.gz: 1c33f438780355d349dbe78ea0706cfcdc4165f3f402aae26042414f01a975e20a1f244621ca1486c36d10877b7b4d825a4c0aed6ef6a3a69dc0a41c1cd38ace

data/lib/async/barrier.rb

@@ -50,11 +50,26 @@ module Async
 			@tasks.empty?
 		end
 		
-		# Wait for tasks in FIFO order.
+		# Wait for all tasks.
+		# @asynchronous Will wait for tasks to finish executing.
 		def wait
-			while task = @tasks.shift
-				task.wait
+			# TODO: This would be better with linked list.
+			while @tasks.any?
+				task = @tasks.first
+				
+				begin
+					task.wait
+				ensure
+					# Remove the task from the waiting list if it's finished:
+					@tasks.shift if @tasks.first == task
+				end
 			end
 		end
+		
+		def stop
+			# We have to be careful to avoid enumerating tasks while adding/removing to it:
+			tasks = @tasks.dup
+			tasks.each(&:stop)
+		end
 	end
 end

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

@@ -293,32 +293,23 @@ module Async
 			Console.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
-		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

@@ -71,7 +71,7 @@ module Async
 		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

@@ -156,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:
@@ -250,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)

data/lib/async/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-07-29 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.0.3.1
 signing_key:
 specification_version: 4
 summary: A concurrency framework for Ruby.