parallizer 0.2.1 → 0.2.2

data/README.md

@@ -161,5 +161,5 @@ http_service.get('www.google.com', '/?q=foo') # Will be called up to 4 times
 
 # Copyright
 
-Copyright (c) 2012 Michael Pearce, Bookrenter.com. See LICENSE.txt for further details.
+Copyright (c) 2012 Michael Pearce, Rafter.com. See LICENSE.txt for further details.
 

data/lib/parallizer.rb

@@ -4,6 +4,8 @@ require 'parallizer/proxy'
 require 'parallizer/method_call_notifier'
 
 class Parallizer
+  WORK_QUEUE_SIZE = 10
+  
   attr_reader :calls, :call_infos, :client, :proxy, :options
   
   def initialize(client, options = {})
@@ -47,7 +49,20 @@ class Parallizer
   end
   
   def self.work_queue
-    @parallizer_work_queue ||= WorkQueue.new(10)
+    @parallizer_work_queue ||= create_work_queue
+  end
+  
+  def self.create_work_queue
+    work_queue = WorkQueue.new(WORK_QUEUE_SIZE)
+    
+    # Force threads to be available - the work_queue gem seems to not always create the threads
+    WORK_QUEUE_SIZE.times do |i|
+      work_queue.enqueue_b do
+        1000.times { |i| i ** 1000 }
+      end
+    end
+    
+    work_queue
   end
   
   private
@@ -67,7 +82,7 @@ class Parallizer
           end
         ensure
           call_info[:complete?] = true
-          call_info[:condition_variable].signal
+          call_info[:condition_variable].broadcast
         end
       end
     end

data/lib/parallizer/version.rb

@@ -1,3 +1,3 @@
 class Parallizer
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/parallizer_spec.rb

@@ -21,6 +21,12 @@ describe Parallizer do
     end
   end
   
+  describe "#work_queue" do
+    it "should have WORK_QUEUE_SIZE threads" do
+      Parallizer.work_queue.cur_threads.should == Parallizer::WORK_QUEUE_SIZE
+    end
+  end
+  
   describe "#add" do
     before do
       @client = TestObject.new
@@ -148,4 +154,26 @@ describe Parallizer do
       end
     end
   end
+  
+  context "with multiple threads making calls to proxy before worker executed" do
+    it "should not deadlock" do # note, this was deadlocking when using CV#signal instead of CV#broadcast
+      # force our worker thread to run after two calls from other threads
+      Parallizer::WORK_QUEUE_SIZE.times do
+        Parallizer.work_queue.enqueue_b do
+          sleep(2)
+        end
+      end
+
+      # setup the proxy
+      parallizer = Parallizer.new(TestObject.new)
+      parallizer.add.another_method
+      proxy = parallizer.create_proxy
+
+      Thread.new do
+        proxy.another_method # call in another thread must happen before call in main thread for it to deadlock
+      end
+      sleep(1)
+      proxy.another_method
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: work_queue