connection_pool 0.0.2 → 0.0.3

data/lib/connection_pool/timed_queue.rb

@@ -11,18 +11,19 @@ class TimedQueue
   def push(obj)
     @mutex.synchronize do
       @que.push obj
-      @resource.signal
+      @resource.broadcast
     end
   end
   alias_method :<<, :push
 
   def timed_pop(timeout=0.5)
+    deadline = Time.now + timeout
     @mutex.synchronize do
-      if @que.empty?
+      loop do
+        return @que.shift unless @que.empty?
+        raise Timeout::Error if Time.now > deadline
         @resource.wait(@mutex, timeout)
-        raise Timeout::Error if @que.empty?
       end
-      return @que.shift
     end
   end
 
@@ -37,4 +38,4 @@ class TimedQueue
   def length
     @que.length
   end
-end
+end

data/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
 module ConnectionPool
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_connection_pool.rb

@@ -1,3 +1,4 @@
+Thread.abort_on_exception = true
 require 'helper'
 
 class TestConnectionPool < MiniTest::Unit::TestCase
@@ -47,6 +48,7 @@ class TestConnectionPool < MiniTest::Unit::TestCase
       pool.do_something
     end
 
+    sleep 0.05
     pool.with do |conn|
       refute_nil conn
     end
@@ -65,4 +67,16 @@ class TestConnectionPool < MiniTest::Unit::TestCase
     end
     assert_equal 1, result
   end
+
+  def test_heavy_threading
+    pool = ConnectionPool.new(:timeout => 0.5, :size => 3) { NetworkConnection.new }
+    20.times do
+      Thread.new do
+        pool.with do |net|
+          sleep 0.05
+        end
+      end
+    end
+    sleep 0.5
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: connection_pool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -07:00
+date: 2011-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: []