gene_pool 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1bdaf7ba625db87160e8afdf2ed0dc1769c036
-  data.tar.gz: af8f23899faaea5e5c681807ffaab6ea29651a3b
+  metadata.gz: 65f8bc24d422c5746e94dc1e295908b58da9220f
+  data.tar.gz: 9784d1f48c019d0e713b220150354973bf80b11c
 SHA512:
-  metadata.gz: 4a861f3844f435b77944cb4699335066278facec8c71bfa581c16bd480ffcd9d34192bbbce6fe6095de474779a66bc59838a5f2a10d62aae54cd1b53418f8220
-  data.tar.gz: 012a79fb29dc53ebf5ae09a94913e45df5ee1fd810c797671f9a090bb7cd50928b38c06e620d3eb56c61cf4b2481f9d18576ebe88e7f5d683c593ffb3e0c8fca
+  metadata.gz: 94e48da354cfadc86e17640d18a926525f748659d9e5ed2b1571ad0be4a2f1be552901aa6d4d585c2c7f211687f784b54fa3b8299788820577985a150e4c1d46
+  data.tar.gz: 767e6165d9704693e62d4b70ae0f8aa8765fd1163f726e6cdede4f3a22afcb8030600a7c0097afc5122b37fb6397f9679d9f5eb8291029aaf54babf64c79a27b

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gemspec
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubysl-test-unit'

data/History.md

@@ -1,6 +1,10 @@
 GenePool Changelog
 =====================
 
+1.4.1 / 2014-04-29
+  - Close connection outside of the mutex.
+  - When iterating over the connections, don't include connections still in the process of being created (set to the reserved_placeholder).
+
 1.4.0 / 2014-04-18
 
   - Use Monitor instead of Mutex for locking to prevent recursive lock issues.

data/lib/gene_pool.rb

@@ -1,11 +1,13 @@
 require 'logger'
 require 'thread'
+require 'thread_safe'
 require 'monitor'
 
 # Generic connection pool class
 class GenePool
 
-  attr_accessor :name, :pool_size, :warn_timeout, :logger, :timeout_class
+  attr_accessor :name, :warn_timeout, :logger, :timeout_class
+  attr_reader   :pool_size
 
   # Creates a gene_pool.  The passed block will be used to initialize a single instance of
   # the item being pooled (i.e., socket connection or whatever)
@@ -40,7 +42,7 @@ class GenePool
     @checked_out = []
     # Map the original connections object_id within the with_connection method to the final connection.
     # This could change if the connection is renew'ed.
-    @with_map    = {}
+    @with_map    = ThreadSafe::Hash.new
 
     setup_mutex
   end
@@ -130,16 +132,12 @@ class GenePool
   # Note that with_connection_auto_remove automatically does this
   def with_connection
     connection = checkout
-    @mutex.synchronize do
-      @with_map[connection.object_id] = connection
-    end
+    @with_map[connection.object_id] = connection
     begin
       yield connection
     ensure
-      @mutex.synchronize do
-        # Update connection for any renew's that have occurred
-        connection = @with_map.delete(connection.object_id)
-      end
+      # Update connection for any renew's that have occurred
+      connection = @with_map.delete(connection.object_id)
       checkin(connection) if connection
     end
   end
@@ -149,7 +147,7 @@ class GenePool
     with_connection do |connection|
       begin
         yield connection
-      rescue Exception => e
+      rescue Exception
         remove(connection)
         raise
       end
@@ -204,10 +202,8 @@ class GenePool
     @mutex.synchronize do
       index = @checked_out.index(old_connection)
       raise Error.new("Can't reassign non-checked out connection for #{@name}") unless index
-      close_connection(old_connection)
       @checked_out[index] = new_connection
       @connections[@connections.index(old_connection)] = new_connection
-
       # If this is part of a with_connection block, then track our new connection
       if @with_map.respond_to?(:key)
         with_key = @with_map.key(old_connection)
@@ -218,7 +214,10 @@ class GenePool
 
       @with_map[with_key] = new_connection if with_key
     end
-    @logger.debug {"#{@name}: Renewed connection old=#{old_connection.object_id} new=#{new_connection}(#{new_connection.object_id})"}
+    # Since connection has been removed, it can be closed outside the mutex
+    close_connection(old_connection)
+
+    @logger.debug {"#{@name}: Renewed connection old=#{old_connection.inspect} new=#{new_connection.inspect}"}
     return new_connection
   end
 
@@ -226,11 +225,26 @@ class GenePool
   # This should probably only ever be used to allow interrupt of a connection that is checked out?
   def each
     @mutex.synchronize do
-      @connections.each { |connection| yield connection }
+      # Don't include the ones in a reserved_placeholder state because that object is meaningless
+      @connections.each { |connection| yield connection unless connection.kind_of?(Thread) }
     end
   end
 
+  # Return a copy of all the current connections
+  def connections
+    connections = @mutex.synchronize { connections = @connections.dup }
+    connections.delete_if { |c| c.kind_of?(Thread) }
+    connections.freeze
+    connections
+  end
+
+  # Close all connections and wait for active connections to complete
+  #
+  # Parameters:
+  #   timeout:
+  #     Maximum time to wait for connections to close before returning
   def close(timeout=10)
+    # Prevent any new connections from being handed out
     self.pool_size = 0
     start_time = Time.now
     while (Time.now - start_time) < timeout

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gene_pool
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Brad Pardee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
-dependencies: []
+date: 2014-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 description: Generic pooling library for creating a connection pool
 email:
 - bradpardee@gmail.com