concurrent_worker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b87c721ec0afe8f8cc7a63e2f966b15f3ec7ee3afe7b9bca92318efb4b21f6db
-  data.tar.gz: b04acf17b575e0f0b2b0b00bc0ae93c2c05714fb472bf2ea184b651061974380
+  metadata.gz: 3cca5e7fa079b2ca384298714ace4deb0eab604e6b46c35d2c045a7598eccdec
+  data.tar.gz: 8d6bc370412e62652e61abe7d40720d87b8bfa83037edab3d60fe80f090e49fb
 SHA512:
-  metadata.gz: 67caefcf14850a02e930b4379976d80c6616cf1d7232b5296bf51653897e3034e401d1cca12b5606f74f43d2abd5fbfef6a504a83c10c91047aa9167529c53cc
-  data.tar.gz: d41da169a6d9d419fc0b15973d551881d4535fcd308b0920a5e4c45289b0444d7ce277918a86396ed89c8c381713bc3f72fbad1b136a8a3a9510c275acc58581
+  metadata.gz: cbef59386d3374cc696d3aa4e84f03cadf70a8247e50c52d1eb6eb8e7cdc0987da150a5db2587ccc24caac141b9883863ac141f16a23a6e6b69837d3b94d5d40
+  data.tar.gz: d511c9ffb9bf463f3635980a370da1647c103dea03ebc002c653ab3653a374bd37745d4496fbd4b10e08a19fac64d50604799386515cd6c3ce3ea108f5645103

data/Gemfile.lock

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

data/lib/concurrent_worker/version.rb

@@ -1,3 +1,3 @@
 module ConcurrentWorker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/concurrent_worker.rb

@@ -87,6 +87,8 @@ module ConcurrentWorker
 
       @snd_queue_max = @options[:snd_queue_max] || 2
       @req_counter = RequestCounter.new
+      @options[ :result_callback_interrupt ]  ||= :immediate 
+      @options[ :retired_callback_interrupt ] ||= :immediate 
 
       case @options[:type]
       when :process
@@ -113,10 +115,14 @@ module ConcurrentWorker
     end
     
     def call_result_callbacks(args)
-      @result_callbacks.each do |callback|
-        callback.call(*args)
+      Thread.handle_interrupt(Object => :never) do        
+        Thread.handle_interrupt(Object => @options[ :result_callback_interrupt ] ) do
+          @result_callbacks.each do |callback|
+            callback.call(*args)
+          end
+        end
+        @req_counter.pop
       end
-      @req_counter.pop
     end
     
     def add_retired_callback(&callback)
@@ -128,8 +134,10 @@ module ConcurrentWorker
     end
     
     def call_retired_callbacks
-      @retired_callbacks.each do |callback|
-        callback.call
+      Thread.handle_interrupt(Object => @options[ :retired_callback_interrupt ] ) do
+        @retired_callbacks.each do |callback|
+          callback.call
+        end
       end
     end
     
@@ -216,12 +224,16 @@ module ConcurrentWorker
     def cncr_block
       @thread_channel = Queue.new
       @thread =  Thread.new do
-        begin
-          yield_base_block
-        ensure
-          @req_counter.close
-          @thread_channel.close
-          call_retired_callbacks
+        Thread.handle_interrupt(Object => :never) do
+          begin
+            Thread.handle_interrupt(Object => :immediate) do
+              yield_base_block
+            end
+          ensure
+            @req_counter.close
+            @thread_channel.close
+            call_retired_callbacks
+          end
         end
       end
     end
@@ -260,19 +272,23 @@ module ConcurrentWorker
       
       def send(obj)
         begin
-          data = Marshal.dump(obj)
-          @wio.write([data.size].pack("I"))
-          @wio.write(data)
+          Thread.handle_interrupt(Object => :never) do
+            data = Marshal.dump(obj)
+            @wio.write([data.size].pack("I"))
+            @wio.write(data)
+          end
         rescue Errno::EPIPE
         end
       end
 
       def recv
         begin
-          szdata = @rio.read(4)
-          return [] if szdata.nil?
-          size = szdata.unpack("I")[0]
-          Marshal.load(@rio.read(size))
+          Thread.handle_interrupt(Object => :on_blocking) do
+            szdata = @rio.read(4)
+            return [] if szdata.nil?
+            size = szdata.unpack("I")[0]
+            Marshal.load(@rio.read(size))
+          end
         rescue IOError
           raise StopIteration
         end
@@ -285,21 +301,25 @@ module ConcurrentWorker
 
     def set_rcv_thread
       Thread.new do
-        begin
-          loop do
-            result = @ipc_channel.recv
-            break if result == :worker_loop_finished
-            raise result if result.kind_of?(Exception)
-
-            call_result_callbacks(result)
+        Thread.handle_interrupt(Object => :never) do
+          begin
+            Thread.handle_interrupt(Object => :immediate) do
+              loop do
+                result = @ipc_channel.recv
+                break if result == :worker_loop_finished
+                raise result if result.kind_of?(Exception)
+
+                call_result_callbacks(result)
+              end
+            end
+          rescue
+            Thread.pass
+            raise $!
+          ensure
+            @req_counter.close
+            @ipc_channel.close
+            call_retired_callbacks
           end
-        rescue
-          Thread.pass
-          raise $!
-        ensure
-          @req_counter.close
-          @ipc_channel.close
-          call_retired_callbacks
         end
       end
     end
@@ -418,23 +438,25 @@ 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)
+      defined?(@work_block) || @work_block = nil
+      worker_options = {
+        type:                       @options[:type],
+        snd_queue_max:              @snd_queue_max,
+        result_callback_interrupt:  :never,
+        retired_callback_interrupt: :never
+      }
+      w = Worker.new(*@args, worker_options, &@work_block)
       w.add_callback do |*arg|
-        Thread.handle_interrupt(Object => :never) do
-          @rcv_queue.push(arg)
-          @ready_queue.push(w)
-        end
+        @rcv_queue.push(arg)
+        @ready_queue.push(w)
       end
 
       w.add_retired_callback do
-        Thread.handle_interrupt(Object => :never) do
-          w.req_counter.rest.each do
-            |req|
-            @snd_queue.push(req)
-          end
-          @ready_queue.push(w)
+        w.req_counter.rest.each do
+          |req|
+          @snd_queue.push(req)
         end
+        @ready_queue.push(w)
       end
       
       @set_blocks.each do |symbol, block|

metadata

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