async-pool 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df755b3a1ec23182af37b80f498c301e42b0e333c97e663b4f065453c66d36cd
-  data.tar.gz: 1af8d6d7b3f67fcaad73527dbf278133813564ff152c0733cdf4e7da88704334
+  metadata.gz: 91d47d29e5bb2e6a93668145c06b432ee26393019cb253d284ffb48cf2c8285b
+  data.tar.gz: 3b3d98e86aec3e783fa5ed98eb803d0f8efe382c0f4b32d518779c09ca736c2d
 SHA512:
-  metadata.gz: 941097d316256c77a43a700468ad8dbd2549a3c433c1a8393913fbeb72d06886b6f0f59d1689902b3ea923e02a2e90ee3dd9269cb14a6b619160aa025d864a80
-  data.tar.gz: a8d87b81f9ec2942d9bb7547b712d239df6fe072f39eb9c6d3d6bc81b16c8a76a79f3ff3fe0746ab7bc8428228fcf391d8a05d7606b13729de878dae80185c96
+  metadata.gz: 34260d06050fe9829ddd40c2a29444548707661262e34df4bd956f3f1a37dd34ab7f6a59cb78ae1acc7388951ec3777b52beff1fa8e2bf6426ad46214e724d21
+  data.tar.gz: f82218caa4733fec59c17ef9aff190e1617aee3049a16629ecfbc15b0c7e6618f1176f9f2bb26e2e67db0388b5f5dc7f164add84efd09f9e49c0776bb36a690d

data/lib/async/pool/controller.rb

@@ -20,6 +20,7 @@
 
 require 'async/logger'
 
+require 'async'
 require 'async/notification'
 require 'async/semaphore'
 
@@ -32,17 +33,25 @@ module Async
 			
 			def initialize(constructor, limit: nil)
 				@resources = {}
-				@available = Async::Notification.new
+				
+				@available = []
+				@notification = Async::Notification.new
 				
 				@limit = limit
 				
 				@constructor = constructor
 				@guard = Async::Semaphore.new(1)
+				
+				@gardener = nil
 			end
 			
 			# @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 +68,7 @@ module Async
 			
 			# Wait until a pool resource has been freed.
 			def wait
-				@available.wait
+				@notification.wait
 			end
 			
 			def empty?
@@ -91,6 +100,8 @@ module Async
 			def close
 				@resources.each_key(&:close)
 				@resources.clear
+				
+				@gardener&.stop
 			end
 			
 			def to_s
@@ -131,11 +142,24 @@ module Async
 				
 				resource.close
 				
-				@available.signal
+				@notification.signal
 			end
 			
 			protected
 			
+			def start_gardener
+				return if @gardener
+				
+				Async(transient: true) do |task|
+					@gardener = task
+					
+					Task.yield
+				ensure
+					@gardener = nil
+					self.close
+				end
+			end
+			
 			def usage_string
 				"#{@resources.size}/#{@limit || '∞'}"
 			end
@@ -150,52 +174,58 @@ 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
 			end
 			
 			def create_resource
+				self.start_gardener
+				
 				# 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..."}
+						Async.logger.debug(self) {"No available resources, allocating new one..."}
 						
 						return create_resource
 					end

data/lib/async/pool/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bake-modernize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,29 +94,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
-- async-pool.gemspec
 - lib/async/pool.rb
 - lib/async/pool/controller.rb
 - lib/async/pool/resource.rb
 - lib/async/pool/version.rb
 homepage: https://github.com/socketry/async-pool
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  funding_uri: https://github.com/sponsors/ioquatix/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,15 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: A Redis client library.
+summary: A singleplex and multiplex resource pool for implementing robust clients.
 test_files: []

data/.editorconfig

@@ -1,6 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 2
-

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-.covered.db

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---warnings
---require spec_helper

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.6
-      env: COVERAGE=BriefSummary,Coveralls
-    - rvm: ruby-head
-    - rvm: truffleruby
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: truffleruby
-    - rvm: jruby-head

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/README.md

@@ -1,72 +0,0 @@
-# Async::Pool
-
-Provides support for connection pooling both singleplex and multiplex resources.
-
-[![Build Status](https://travis-ci.com/socketry/async-pool.svg)](https://travis-ci.com/socketry/async-pool)
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'async-pool'
-```
-
-And then execute:
-
-	$ bundle
-
-Or install it yourself as:
-
-	$ gem install async-pool
-
-## Usage
-
-`Async::Pool::Controller` provides support for both singleplex (one stream at a time) and multiplex resources (multiple streams at a time).
-
-`Async::Pool::Resource` is provided as an interface and to document how to use the pools. However, you wouldn't need to use this in practice and just implement the appropriate interface on your own objects.
-
-```ruby
-pool = Async::Pool::Controller.new(Async::Pool::Resource)
-
-pool.acquire do |resource|
-	# resource is implicitly released when exiting the block.
-end
-
-resource = pool.acquire
-
-# Return the resource back to the pool:
-pool.release(resource)
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2019, by [Samuel G. D. Williams](http://www.codeotaku.com).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec

data/async-pool.gemspec

@@ -1,28 +0,0 @@
-
-require_relative 'lib/async/pool/version'
-
-Gem::Specification.new do |spec|
-	spec.name          = "async-pool"
-	spec.version       = Async::Pool::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-	
-	spec.summary       = "A Redis client library."
-	spec.homepage      = "https://github.com/socketry/async-pool"
-	
-	spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-		f.match(%r{^(test|spec|features)/})
-	end
-	
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.require_paths = ["lib"]
-	
-	spec.add_dependency("async", "~> 1.8")
-	
-	spec.add_development_dependency "async-rspec", "~> 1.1"
-	
-	spec.add_development_dependency "covered"
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "rake"
-end