vuf 0.0.2 → 1.0.0

data/lib/vuf/batch.rb

@@ -2,13 +2,14 @@ module Vuf
   class Batch
     def initialize(size,&batch)
       @mutex = Mutex.new
-      @batchQ = SizedQueue.new(size)
+      @batchQ = []
+      @size = size
       @batch = batch
     end
     
     def push(obj)
-      @batchQ.push(obj)
-      objsToProc = get_objs(@batchQ.max)
+      @mutex.synchronize { @batchQ << obj }
+      objsToProc = get_objs(@size)
       @batch.call(objsToProc) unless objsToProc.nil?
     end
     
@@ -22,9 +23,8 @@ module Vuf
       objToProc = nil
       @mutex.synchronize do
         if size_condition <= @batchQ.size
-          objToProc = []
-          objToProc <<  @batchQ.pop until @batchQ.empty?
-          @batchQ.clear
+          objToProc = @batchQ
+          @batchQ = []
         end
       end     
       return objToProc

data/lib/vuf/pool.rb

@@ -63,6 +63,31 @@ module Vuf
           end
           !instance__.nil?
         end
+
+        def klass.count
+          count = 0
+          @pool__mutex__.synchronize do
+            count = @pool__instances__.size + @used__instances__.size
+          end
+          return count
+        end
+
+        def klass.running
+          count = 0
+          @pool__mutex__.synchronize do
+            count = @used__instances__.size
+          end
+          return count
+        end
+        
+        def klass.finalize # :nodoc:
+          @pool__mutex__.synchronize do
+            until @pool__instances__.empty?
+              i = @pool__instances__.pop
+              i.finalize if i.respond_to?(:finalize)
+            end
+          end
+        end
         
         klass
       end

data/lib/vuf/version.rb

@@ -1,3 +1,3 @@
 module Vuf
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/vuf/working_pool.rb

@@ -25,8 +25,8 @@ module Vuf
 	    end
     end
 
-    def do(channel=nil,&task)
-      @wq.push([channel,task])
+    def do(channel=nil, *args, &task)
+      @wq.push([channel,task,args])
     end
 
     def finalize
@@ -37,19 +37,21 @@ module Vuf
       @workers.each do |worker|
         worker.join
       end
+      @workers=nil
     end
     
     private
     
-    def try_lock_channel(channel,task)
+    def try_lock_channel(channel,task, args)
       new_channel_q = nil
       @channels_mutex.synchronize {
         if @channels[channel].nil?
 	        new_channel_q = @channelsQ.shift
+          raise "Missing queue in working pool" unless new_channel_q.instance_of?(Queue)
           @channels[channel]=new_channel_q
 	      end
+        @channels[channel].push([task, args])
       }
-      @channels[channel].push(task)
       return new_channel_q
     end
     
@@ -64,16 +66,20 @@ module Vuf
 
     def works
       task=nil
-      until ENDING_TASK == (task= @wq.pop)
-        channel = task.first
-        task = task.last
+      until ENDING_TASK == (channel, task, args = @wq.pop)
         channelQ = nil
-	channelQ = try_lock_channel(channel,task) unless channel.nil?
-        if channelQ.nil?
-	  task.call
-        else
-          channelQ.pop.call until is_clear(channel)
-	end
+        channelQ = try_lock_channel(channel, task, args) unless channel.nil?
+        unless channelQ.nil?
+          until is_clear(channel)
+            task,args = channelQ.pop
+            begin
+              task.call(*args)
+            rescue => e
+              Logger.error "Worker catch a task exception :\n#{e.message}\n#{e.backtrace.join("\n")}"
+            end
+          end
+          channelQ = nil
+        end
       end
     end
   end

data/lib/vuf.rb

@@ -6,6 +6,7 @@ require "vuf/logger"
 require "vuf/working_pool"
 require "vuf/pool"
 require "vuf/batch"
+require "vuf/profiler"
 
 module Vuf
   # Your code goes here...

data/test/lib/vuf/wp_test.rb

@@ -26,5 +26,16 @@ describe Vuf::WorkingPool do
     end
     subject.finalize
   end
+  
+  it "must handle do with params and channel without error" do
+    subject.run
+    5.times do |i|
+      subject.do(nil,i) { |var|
+        sleep(var/10) 
+      }
+    end
+    subject.finalize
+  end
+  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vuf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler