async-pool 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc00b6087965cc5fc3f58ae151a0048fc8cf351aab9c06bdaf46b0eb65bb877
-  data.tar.gz: 7f9e3067d5bc75de995735ac4a025cb6cea4ee72e0e63201ec4f28c000301cc2
+  metadata.gz: eb369c01748a2f2c555a8549a2280c1e39b30a3c7f7918e4e426a79d7eec41ce
+  data.tar.gz: 5b8d9ac62de382ce06753d04512708cca9c969c7eaf368a1f7b88fa12b6d1eae
 SHA512:
-  metadata.gz: e6933852df812446375faf0c0c921c137bdd972beec9f1e392f6bdfc0c803ddf1cf62151323fbd18f8431c9ab1021eaac2c90ab461f03679d3e93cebfbc039b0
-  data.tar.gz: 76a83cc5cc6a5dc2230ae6ad3eedc12a0e4fc24170d7391d5a1c032553d4a5653fc89b12060e331bd64687fefb5308d64785bbdc9cc70701b3f86e394de718f2
+  metadata.gz: b18bfe389d25644da07f2e8f85bd92891f7066e1c9b67d6ed91e9a9de1e8d47bcaf4e612c7388619a8693c2f6ee2fc85a09f0cada7647f53a2de5714dbaac30a
+  data.tar.gz: 0bb8ca350d3942057cfcc91ff957382512ee0e1e012e20344ba71b6bf09df7a353c65d4996341fc8407d99629a8286346a6412a4e6bc6a0199dcaf67e11d069f

data/lib/async/pool/controller.rb

@@ -154,20 +154,18 @@ module Async
 				retire(resource) unless processed
 			end
 			
+			private def drain
+				# Enumerate all existing resources and retire them:
+				while resource = acquire_existing_resource
+					retire(resource)
+				end
+			end
+			
 			# Close all resources in the pool.
 			def close
-				@available.clear
-				
-				while pair = @resources.shift
-					resource, usage = pair
-					
-					if usage > 0
-						Console.warn(self, resource: resource, usage: usage) {"Closing resource while still in use!"}
-					end
-					
-					resource.close
-				end
+				self.drain
 				
+				@available.clear
 				@gardener&.stop
 			end
 			
@@ -224,6 +222,8 @@ module Async
 			def start_gardener
 				return if @gardener
 				
+				@gardener = true
+				
 				Async(transient: true, annotation: "#{self.class} Gardener") do |task|
 					@gardener = task
 					
@@ -319,7 +319,7 @@ module Async
 				resource = nil
 				
 				@guard.acquire do
-					resource = get_resource
+					resource = acquire_or_create_resource
 				end
 				
 				return resource
@@ -330,7 +330,24 @@ module Async
 			
 			private
 			
-			def get_resource
+			# Acquire an existing resource with zero usage.
+			# If there are resources that are in use, wait until they are released.
+			def acquire_existing_resource
+				while @resources.any?
+					@resources.each do |resource, usage|
+						if usage == 0
+							return resource
+						end
+					end
+					
+					@notification.wait
+				end
+				
+				# Only when the pool has been completely drained, return nil:
+				return nil
+			end
+			
+			def acquire_or_create_resource
 				while resource = @available.last
 					if usage = @resources[resource] and usage < resource.concurrency
 						if resource.viable?

data/lib/async/pool/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Pool
-		VERSION = "0.7.1"
+		VERSION = "0.8.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-pool
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async