fizx-thread_pool 0.1.0 → 0.2.0

data/CHANGELOG

@@ -1,2 +1,5 @@
+0.2.0
+- synchronous_execute
+- queue_limit
 0.1.0
 - Initial release

data/lib/thread_pool.rb

@@ -9,6 +9,7 @@ class ThreadPool
           if block = queue.shift
             @active = true
             block.call
+            block.complete = true
           else
             @active = false
             sleep 0.01
@@ -22,17 +23,30 @@ class ThreadPool
     end
   end
   
+  attr_accessor :queue_limit
+  
   # Initialize with number of threads to run
-  def initialize(count)
+  def initialize(count, queue_limit = 0)
     @executors = []
     @queue = []
+    @queue_limit = queue_limit
     @count = count    
     count.times { @executors << Executor.new(@queue) }
   end
   
   # Runs the block at some time in the near future
   def execute(&block)
-    @queue << block 
+    init_completable(block)
+    if @queue_limit > 0
+      sleep 0.01 until @queue.size < @queue_limit
+    end
+    @queue << block
+  end
+  
+  # Runs the block at some time in the near future, and blocks until complete  
+  def synchronous_execute(&block)
+    execute(&block)
+    sleep 0.01 until block.complete?
   end
   
   # Size of the task queue
@@ -54,4 +68,20 @@ class ThreadPool
   def join
     sleep 0.01 until @queue.empty? && @executors.all?{|e| !e.active}
   end
+  
+protected
+  def init_completable(block)
+    block.extend(Completable)
+    block.complete = false
+  end
+  
+  module Completable
+    def complete=(val)
+      @complete = val
+    end
+    
+    def complete?
+      !!@complete
+    end
+  end
 end

data/test/test_thread_pool.rb

@@ -30,6 +30,24 @@ class TestThreadPool < Test::Unit::TestCase
     assert_equal n - THREADS, @pool.waiting
   end
   
+  def test_queue_limit
+    n = 50
+    @foo = 0
+    @pool.queue_limit = 1
+    begin
+      Timeout::timeout(0.2) do
+        n.times {
+          @pool.execute {  sleep 1 }
+          @foo += 1
+        }
+      end 
+    rescue Timeout::Error
+      assert_equal @pool.queue_limit + @pool.size, @foo
+    else
+      assert false
+    end
+  end
+  
   def test_execution
     Timeout::timeout(1) do
       n = 50
@@ -41,4 +59,16 @@ class TestThreadPool < Test::Unit::TestCase
       assert_equal n, @foo.length
     end
   end
+  
+  def test_synchronous_execute
+    Timeout::timeout(1) do
+      @foo = false
+      @pool.execute { sleep 0.01; @foo = true }
+      assert !@foo
+    
+      @foo = false
+      @pool.synchronous_execute { sleep 0.01; @foo = true }
+      assert @foo
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fizx-thread_pool
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kyle Maxwell