parallizer 0.3.1 → 0.4.0

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    parallizer (0.3.1)
-      work_queue
+    parallizer (0.4.0)
+      celluloid (~> 0.11.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     always_execute (0.1.3)
+    celluloid (0.11.1)
+      timers (>= 1.0.0)
     diff-lcs (1.1.3)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -18,7 +20,7 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    work_queue (2.5.2)
+    timers (1.1.0)
 
 PLATFORMS
   ruby

data/lib/parallizer.rb

@@ -1,6 +1,6 @@
-require 'work_queue'
 require 'parallizer/version'
 require 'parallizer/proxy'
+require 'parallizer/worker'
 require 'parallizer/method_call_notifier'
 
 class Parallizer
@@ -8,81 +8,72 @@ class Parallizer
   
   class << self
     def work_queue_size
-      work_queue.max_threads
+      @work_queue_size || DEFAULT_WORK_QUEUE_SIZE
     end
     
-    def work_queue_size=(size)
-      work_queue = Thread.current[:parallizer_work_queue]
-      if work_queue.nil? || work_queue.max_threads != size
-        Thread.current[:parallizer_work_queue] = WorkQueue.new(size)
-      end
+    def work_queue_size=(work_queue_size)
+      @work_queue_size = work_queue_size
     end
-
+    
     def work_queue
-      # TODO: share the work queue among calling threads
-      Thread.current[:parallizer_work_queue] ||= WorkQueue.new(DEFAULT_WORK_QUEUE_SIZE)
+      # TODO: share the work queue among calling threads??
+      queue = Thread.current[:parallizer_work_queue]
+      if queue.nil? || Thread.current[:parallizer_work_queue_size] != work_queue_size
+        queue = Thread.current[:parallizer_work_queue] = ::Parallizer::Worker.pool(:size => work_queue_size)
+        Thread.current[:parallizer_work_queue_size] = work_queue_size
+      end
+      
+      queue
     end
   end
   
   attr_reader :calls, :call_infos, :client, :proxy, :options
-  
+
   def initialize(client, options = {})
     @client = client
     @options = {:retries => 0}.merge(options)
     @call_infos = {}
   end
-  
+
   def add
-    MethodCallNotifier.new do |*args|
+    ::Parallizer::MethodCallNotifier.new do |*args|
       add_call(*args)
     end
   end
-  
+
   def calls
     @call_infos.keys
   end
-  
+
   def add_call(method_name, *args)
     raise ArgumentError, "Cannot add calls after proxy has been generated" if @proxy
-    
+
     method_name_and_args = [method_name.to_sym, *args]
     return if call_infos[method_name_and_args]
-    
+
     call_info = {
+      :future => ::Parallizer::work_queue.future(:run, @client, method_name, args, options),
       :result => nil,
-      :exception => nil,
-      :retries => options[:retries]
+      :exception => nil
     }
     call_infos[method_name_and_args] = call_info
   end
-  
+
   def create_proxy
     raise ArgumentError, "Cannot create another proxy" if @proxy
-    
+
     execute
-    
-    Parallizer::Proxy.new(client, call_infos)
+
+    ::Parallizer::Proxy.new(client, call_infos)
   end
-  
+
   private
-  
+
   def execute
     call_infos.each do |method_name_and_args, call_info|
-      Parallizer.work_queue.enqueue_b do
-        (call_info[:retries] + 1).times do
-          begin
-            call_info[:exception] = nil # reset exception before each send attempt
-            call_info[:result] = client.send(*method_name_and_args)
-            break # success
-          rescue Exception => e
-            call_info[:exception] = e
-          end
-        end
-      end
+      call_info.merge!(call_info[:future].value)
     end
-    
-    Parallizer.work_queue.join
 
-    Parallizer::Proxy.new(client, call_infos)
+    ::Parallizer::Proxy.new(client, call_infos)
   end
 end

data/lib/parallizer/version.rb

@@ -1,3 +1,3 @@
 class Parallizer
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/parallizer/worker.rb

@@ -0,0 +1,24 @@
+require 'celluloid'
+
+class Parallizer
+  class Worker
+    include Celluloid
+    
+    def run(client, method_name, args, options)
+      result = {}
+      
+      (options[:retries] + 1).times do
+        begin
+          result[:exception] = nil # reset exception before each send attempt
+          result[:result] = client.send(method_name, *args)
+          break # success
+        rescue Exception => e
+          result[:exception] = e
+        end
+      end
+      
+      result
+    end
+  end
+end
+

data/parallizer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'work_queue'
+  s.add_dependency 'celluloid', '~> 0.11.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.9.0'
   s.add_development_dependency 'always_execute', '~> 0.1.1'

data/spec/parallizer/proxy_spec.rb

@@ -1,20 +1,19 @@
 require 'spec_helper'
 
 describe Parallizer::Proxy do
-  DEFAULT_RETURN_VALUE = "return value"
+  CLIENT_RETURN_VALUE = "client return value"
   
-  class TestObject
+  class ClientTestObject
     def a_method(arg)
-      DEFAULT_RETURN_VALUE
+      CLIENT_RETURN_VALUE
     end
   end
   
   describe "#method_missing" do
     before do
-      @client = TestObject.new
+      @client = ClientTestObject.new
       @call_key = []
-      @call_info = {:result => nil, :exception => nil, :complete? => true,
-        :condition_variable => ConditionVariable.new, :mutex => Mutex.new }
+      @call_info = {:result => nil, :exception => nil }
     end
     
     execute do
@@ -43,7 +42,7 @@ describe Parallizer::Proxy do
             end
             a_calling_thread_method
           end
-
+  
           it "should raise exception" do
             @execute_result.class.should == @call_info[:exception].class
             @execute_result.message.should == @call_info[:exception].message
@@ -73,7 +72,7 @@ describe Parallizer::Proxy do
         end
         
         it "should return value from client object" do
-          @execute_result.should == DEFAULT_RETURN_VALUE
+          @execute_result.should == CLIENT_RETURN_VALUE
         end
       end
     end
@@ -92,10 +91,9 @@ describe Parallizer::Proxy do
   
   describe "#respond_to?" do
     before do
-      client = TestObject.new
+      client = ClientTestObject.new
       call_key = [:a_method, 'valid argument']
-      call_info = {:result => nil, :exception => nil, :complete? => true,
-        :condition_variable => ConditionVariable.new, :mutex => Mutex.new }
+      call_info = {:result => nil, :exception => nil }
       @proxy = Parallizer::Proxy.new(client, { call_key => call_info })
     end
     

data/spec/parallizer_spec.rb

@@ -191,10 +191,11 @@ describe Parallizer do
       Parallizer.work_queue_size.should == Parallizer::DEFAULT_WORK_QUEUE_SIZE
     end
     
-    it "should have max threads equal to specified size" do
+    it "should have max threads equal to specified size after requesting the work queue" do
       size = rand(2..5)
       Parallizer.work_queue_size = size
-      Parallizer.work_queue.max_threads.should == size
+      Parallizer.work_queue
+      Thread.current[:parallizer_work_queue_size].should == size
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallizer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: work_queue
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - lib/parallizer/method_call_notifier.rb
 - lib/parallizer/proxy.rb
 - lib/parallizer/version.rb
+- lib/parallizer/worker.rb
 - parallizer.gemspec
 - spec/parallizer/method_call_notifier_spec.rb
 - spec/parallizer/proxy_spec.rb
@@ -111,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1371680506904516612
+      hash: -3493791193896419767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,10 +121,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1371680506904516612
+      hash: -3493791193896419767
 requirements: []
 rubyforge_project: parallizer
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Execute your service layer in parallel