async-pool 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df755b3a1ec23182af37b80f498c301e42b0e333c97e663b4f065453c66d36cd
-  data.tar.gz: 1af8d6d7b3f67fcaad73527dbf278133813564ff152c0733cdf4e7da88704334
+  metadata.gz: 6ad379b03305a3175cb279cdb733802af5d18c8dd4286aa405af0266326ded2e
+  data.tar.gz: a14e523cbf72c0be0153c5281a66e4b15b97bbf46f3ebc1f4f2903b642d84d32
 SHA512:
-  metadata.gz: 941097d316256c77a43a700468ad8dbd2549a3c433c1a8393913fbeb72d06886b6f0f59d1689902b3ea923e02a2e90ee3dd9269cb14a6b619160aa025d864a80
-  data.tar.gz: a8d87b81f9ec2942d9bb7547b712d239df6fe072f39eb9c6d3d6bc81b16c8a76a79f3ff3fe0746ab7bc8428228fcf391d8a05d7606b13729de878dae80185c96
+  metadata.gz: e6977d59abe105dc69cf481500307f1105d5fb3aaecf44804c71202892fa59869b23672b059d396ae1d538d9859a372a4ddb3d21d75a000f172f0ec6a83df9b6
+  data.tar.gz: df123b18dd484354fd59e356f0957e2b95965cf28889592191b92b6f2280cbd96f5d035c3229734382e5d306882b3acfc96d614dff60cbb48f546871b7914f26

data/lib/async/pool/controller.rb

@@ -32,7 +32,9 @@ module Async
 			
 			def initialize(constructor, limit: nil)
 				@resources = {}
-				@available = Async::Notification.new
+				
+				@available = []
+				@notification = Async::Notification.new
 				
 				@limit = limit
 				
@@ -43,6 +45,10 @@ module Async
 			# @attr [Hash<Resource, Integer>] all allocated resources, and their associated usage.
 			attr :resources
 			
+			def size
+				@resources.size
+			end
+			
 			# Whether the pool has any active resources.
 			def active?
 				!@resources.empty?
@@ -59,7 +65,7 @@ module Async
 			
 			# Wait until a pool resource has been freed.
 			def wait
-				@available.wait
+				@notification.wait
 			end
 			
 			def empty?
@@ -131,7 +137,7 @@ module Async
 				
 				resource.close
 				
-				@available.signal
+				@notification.signal
 			end
 			
 			protected
@@ -150,20 +156,21 @@ module Async
 				Async.logger.debug(self) {"Reuse #{resource}"}
 				
 				@resources[resource] -= 1
+				@available.push(resource)
 				
-				@available.signal
+				@notification.signal
 			end
 			
 			def wait_for_resource
 				# If we fail to create a resource (below), we will end up waiting for one to become resources.
 				until resource = available_resource
-					@available.wait
+					@notification.wait
 				end
 				
-				Async.logger.debug(self) {"Wait for resource #{resource}"}
+				Async.logger.debug(self) {"Wait for resource -> #{resource}"}
 				
 				# if resource.concurrency > 1
-				# 	@available.signal
+				# 	@notification.signal
 				# end
 				
 				return resource
@@ -173,27 +180,30 @@ module Async
 				# This might return nil, which means creating the resource failed.
 				if resource = @constructor.call
 					@resources[resource] = 1
+					
+					@available.push(resource) if resource.concurrency > 1
 				end
 				
 				return resource
 			end
 			
 			def available_resource
-				# TODO This is a linear search... not ideal, but simple for now.
-				@resources.each do |resource, count|
-					if count < resource.concurrency
-						# We want to use this resource... but is it connected?
-						if resource.viable?
-							@resources[resource] += 1
-							
-							return resource
+				@guard.acquire do
+					while resource = @available.last
+						if usage = @resources[resource] and usage < resource.concurrency
+							if resource.viable?
+								@resources[resource] += 1
+								
+								return resource
+							else
+								retire(resource)
+								@available.pop
+							end
 						else
-							retire(resource)
+							@available.pop
 						end
 					end
-				end
-				
-				@guard.acquire do
+					
 					if @limit.nil? or @resources.size < @limit
 						Async.logger.debug(self) {"No resources resources, allocating new one..."}
 						

data/lib/async/pool/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module Pool
-		VERSION = "0.1.0"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams