async-pool 0.3.12 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1051396c5d474aee1dc09c05774e39d7f694220f39b70d13ba28296521fbfa
-  data.tar.gz: d217b6e200c52dba446af0c8677f6f5874ed5114607cccff941ac2c885fe7ad7
+  metadata.gz: 90ad67ae4201f83d1a5c9767b425ce1223d0b4d9c068a1046c98948875ec4c15
+  data.tar.gz: 84b8d54ad04302b935f65ca5e13c5929bda43bcf95754db9568f4c99ae7d5e92
 SHA512:
-  metadata.gz: 0c78ae68e5f37b5eef4e385db3b86d355143aa0fd1bd64aef84da4963b508ca621b4141aced44d4a649b20824203e0acda1474c05cadb456d2d277ed0ff3121e
-  data.tar.gz: 94b3019c786c2bac9d05ea1725651f35826f84050adb9813fcdfd12850619b349f1edfb229923fd5a9c4964c24b6c9e94d65fb0d6b970bc20559ce274c2928bf
+  metadata.gz: 3871fcd341afbc5db9af1f6e70ff6b58aeca070f9f8e89a5c4680e20feb33baa4c5d4c946bf2378fc526fa2dc021648ba0ec2b34b08a0de6cf2205ea6065b88f
+  data.tar.gz: 32f66fb6d31ab5413dd104061fd0afc8b3fdfb07d1644a3d315ac40c469cb985d976da393e9b54fb13fd6fff5b5a2680f7c0f00a506c52c735a068e074f890d1

data/lib/async/pool/controller.rb

@@ -17,7 +17,16 @@ module Async
 				self.new(block, **options)
 			end
 			
-			def initialize(constructor, limit: nil, concurrency: nil)
+			def initialize(constructor, limit: nil, concurrency: (limit || 1), policy: nil)
+				@constructor = constructor
+				@limit = limit
+				
+				# This semaphore is used to limit the number of concurrent tasks which are creating new resources.
+				@guard = Async::Semaphore.new(concurrency)
+				
+				@policy = policy
+				@gardener = nil
+				
 				# All available resources:
 				@resources = {}
 				
@@ -25,24 +34,28 @@ module Async
 				# This list may contain false positives, or resources which were okay but have since entered a state which is unusuable.
 				@available = []
 				
+				# Used to signal when a resource has been released:
 				@notification = Async::Notification.new
-				
-				@limit = limit
-				
-				@constructor = constructor
-				
-				# Set the concurrency to be the same as the limit for maximum performance:
-				if limit
-					concurrency ||= limit
-				else
-					concurrency ||= 1
-				end
-				
-				@guard = Async::Semaphore.new(concurrency)
-				
-				@gardener = nil
 			end
 			
+			# @attribute [Proc] The constructor used to create new resources.
+			attr :constructor
+			
+			# @attribute [Integer] The maximum number of resources that this pool can have at any given time.
+			attr_accessor :limit
+			
+			# @attribute [Integer] The maximum number of concurrent tasks that can be creating a new resource.
+			def concurrency
+				@guard.limit
+			end
+			
+			def concurrency= value
+				@guard.limit = value
+			end
+			
+			# @attribute [Policy] The pool policy.
+			attr_accessor :policy
+			
 			# @attribute [Hash(Resource, Integer)] all allocated resources, and their associated usage.
 			attr :resources
 			
@@ -98,6 +111,8 @@ module Async
 				if resource.reusable?
 					processed = reuse(resource)
 				end
+				
+				# @policy.released(self, resource)
 			ensure
 				retire(resource) unless processed
 			end
@@ -181,7 +196,15 @@ module Async
 				Async(transient: true, annotation: "#{self.class} Gardener") do |task|
 					@gardener = task
 					
-					Task.yield
+					while true
+						if @policy
+							@policy.call(self)
+						else
+							Task.yield
+						end
+						
+						self.wait
+					end
 				ensure
 					@gardener = nil
 					self.close
@@ -193,18 +216,18 @@ module Async
 			end
 			
 			def availability_string
-				@resources.collect do |resource,usage|
+				@resources.collect do |resource, usage|
 					"#{usage}/#{resource.concurrency}#{resource.viable? ? nil : '*'}/#{resource.count}"
 				end.join(";")
 			end
 			
-			def usage
-				@resources.count{|resource, usage| usage > 0}
-			end
-			
-			def free
-				@resources.count{|resource, usage| usage == 0}
-			end
+			# def usage
+			# 	@resources.count{|resource, usage| usage > 0}
+			# end
+			#
+			# def free
+			# 	@resources.count{|resource, usage| usage == 0}
+			# end
 			
 			def reuse(resource)
 				Console.logger.debug(self) {"Reuse #{resource}"}
@@ -255,6 +278,8 @@ module Async
 					end
 				end
 				
+				# @policy.created(self, resource)
+				
 				return resource
 			end
 			
@@ -272,7 +297,9 @@ module Async
 				raise
 			end
 			
-			private def get_resource
+			private
+			
+			def get_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.3.12"
+		VERSION = "0.4.0"
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2019-2022, by Samuel Williams.  
+Copyright, 2019-2023, by Samuel Williams.  
 Copyright, 2020, by Simon Perepelitsa.  
 Copyright, 2021, by Olle Jonsson.  
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-pool
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: sus-fixtures-async
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: A singleplex and multiplex resource pool for implementing robust clients.