concurrent_worker 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c743d7ebe52dcc21dcb90529e65d3cd0bbadf66a29dbbe16f8245f3c764cb787
-  data.tar.gz: f6d17a27e1b0666e896ebfeecf1b618ed2d2be87f5e9801899b3387ed4619469
+  metadata.gz: 86b8b4753276bc1539a0e517043df93fde982ecf42aa2a57ca6758cd1a9642ed
+  data.tar.gz: e76f854ea2cb78a4adff9338631b7381ed6e5d79a3aac780c44461a334cbd07c
 SHA512:
-  metadata.gz: 8843c5397cfd752204733a1b5f51f7fa9e924c5a7074ccb41b40f32320ef9a69680b16f1bd65dc9deec731f3ea155c3a8b832faf143499df9dc53525dfaf8d85
-  data.tar.gz: 979d6dd58b496f055a0647f8ff2a531e209c309d7475589998918c09e287b01b031bf0cabc16c7ba12e03dce91448ede61648469f0b55cf5fae8796fb3d6a811
+  metadata.gz: 7c664e6c43c4022da34de9b4f2f45474ad87d09d82bc5f4f2e6eb63423e5c66a433d84dca54941d437b0d8270f0c824c054476cda239b4bc6e50bebfb237ce7b
+  data.tar.gz: 019b80e4ad2a553e4ccdce6d63962da6e2ccaddd3b63d21ab664e55b39c58673d58bc75b8b95bab54dd326e10a632a54b23d9b78aba21deb4639069fa363cf83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    concurrent_worker (0.2.3)
+    concurrent_worker (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -29,7 +29,7 @@ require 'concurrent_worker'
 Thread.abort_on_exception = true
 
 # define a work block.
-logger = ConcurrentWorker::Worker.new do |args|
+logger = ConcurrentWorker::Worker.new do |*args|
   printf(*args)
   $stdout.flush
   nil
@@ -45,7 +45,7 @@ logger.join
 If you need some preparation for the work block, you can define 'base block'.
 
 ```ruby
-logger = ConcurrentWorker::Worker.new do |args|
+logger = ConcurrentWorker::Worker.new do |*args|
   # work block and base block can share object with instance variable(@xxx).
   printf(@file, *args)
   @file.flush

data/lib/concurrent_worker/version.rb

@@ -1,3 +1,3 @@
 module ConcurrentWorker
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/concurrent_worker.rb

@@ -3,6 +3,7 @@ require "concurrent_worker/version"
 module ConcurrentWorker
   class Error < StandardError; end
 
+  require 'thread'
 
   class RequestCounter
     def initialize
@@ -13,14 +14,16 @@ module ConcurrentWorker
       @count.push(args)
     end
     def pop
-      @count.pop
-      @com.push([])
+      Thread.handle_interrupt(Object => :never) do
+        @count.pop
+        @com.push(true)
+      end
     end
     
-    def wait(n)
-      return if @count.size <= n
+    def wait_until_less_than(n)
+      return if @count.size < n
       while @com.pop
-        break if @count.size <= n
+        break if @count.size < n
       end
     end
     def size
@@ -49,7 +52,6 @@ module ConcurrentWorker
 
   
 
-  require 'thread'
   class Worker
     attr_accessor :channel
     # Worker               : worker class
@@ -106,10 +108,13 @@ module ConcurrentWorker
       raise "block is nil" unless callback
       @result_callbacks.push(callback)
     end
+    def clear_callbacks
+      @result_callbacks.clear
+    end
     
     def call_result_callbacks(args)
       @result_callbacks.each do |callback|
-        callback.call(args)
+        callback.call(*args)
       end
       @req_counter.pop
     end
@@ -118,6 +123,9 @@ module ConcurrentWorker
       raise "block is nil" unless callback
       @retired_callbacks.push(callback)
     end
+    def clear_retired_callbacks
+      @retired_callbacks.clear
+    end
     
     def call_retired_callbacks
       @retired_callbacks.each do |callback|
@@ -155,7 +163,7 @@ module ConcurrentWorker
           if work_block
             set_block(:work_block, &work_block)
           end
-          send_res(yield_work_block(args))
+          send_res(yield_work_block(*args))
         end
       end
     end
@@ -168,8 +176,8 @@ module ConcurrentWorker
     
     def run
       @state = :run
-      set_default_loop_block unless @loop_block
-      set_default_base_block unless @base_block
+      set_default_loop_block unless defined?(@loop_block) && @loop_block
+      set_default_base_block unless defined?(@base_block) && @base_block
       cncr_block
     end
     
@@ -177,7 +185,7 @@ module ConcurrentWorker
       unless @state == :run
         run
       end
-      @req_counter.wait(@snd_queue_max)
+      @req_counter.wait_until_less_than(@snd_queue_max)
       begin 
         @req_counter.push([args, work_block])
         send_req([args, work_block])
@@ -189,7 +197,6 @@ module ConcurrentWorker
     
     def quit
       begin 
-        @req_counter.push([])
         send_req([])
         true
       rescue ClosedQueueError, IOError
@@ -198,7 +205,7 @@ module ConcurrentWorker
     end
     
     def join
-      @req_counter.wait(0)
+      @req_counter.wait_until_less_than(1)
       quit
       wait_cncr_proc
     end
@@ -368,7 +375,7 @@ module ConcurrentWorker
         loop do
           break if (result = @rcv_queue.pop).empty?
           @result_callbacks.each do |callback|
-            callback.call(result[0])
+            callback.call(*result[0])
           end
           @req_counter.pop
         end
@@ -411,8 +418,9 @@ module ConcurrentWorker
     
 
     def deploy_worker
+      defined?(@work_block) || @work_block = nil 
       w = Worker.new(*@args, type: @options[:type], snd_queue_max: @snd_queue_max, &@work_block)
-      w.add_callback do |arg|
+      w.add_callback do |*arg|
         @rcv_queue.push([arg])
         @ready_queue.push(w)
       end
@@ -438,13 +446,13 @@ module ConcurrentWorker
     end
     
     def req(*args, &work_block)
-      @req_counter.wait(@max_num * @snd_queue_max)
+      @req_counter.wait_until_less_than(@max_num * @snd_queue_max)
       @req_counter.push(true)
       @snd_queue.push([args, work_block])
     end
 
     def join
-      @req_counter.wait(0)
+      @req_counter.wait_until_less_than(1)
       self.shift.join until self.empty?
       @rcv_queue.push([])
       @rcv_thread.join

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concurrent_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - dddogdiamond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler