concurrent_worker 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d77bf3d8370938048821167d1f8c5a08096c5e91b9f47ffc142d7d93275520e
-  data.tar.gz: eebfcd996c0b334777bf7592811113fb7acbb9db541b514e4285ee80a064f6c3
+  metadata.gz: 695c62e55f8cbedfffed63cee4fc4f6adfe8f975002406878af4b804ae051304
+  data.tar.gz: 3cc2f1074a15fc9d3826d04752262efb251fcdd19183608b8b233737b8f76951
 SHA512:
-  metadata.gz: 69d87367f6edb44ae9ddec0e55df7cde86b94c201334a9a24a2a67b9180cf466f79794b3d8d375ace39d51ba57dcc2c34d61b514110fb08eaf7d9259cedfb2c9
-  data.tar.gz: ea3455877fba65f7879f6f8408d79cc69e9bb6e8395e1ae86cb48e20b737b52776d067a4804b5da906ee68dfc99da1d15cd01637c8dcb9d0718ba00f0eb99c12
+  metadata.gz: 5b6921bc9aafd1f7a20888a084cb425e5c3e65a3caa60ff2ddb937aed6084129c5f4060ecc0870ac55843351ecad6133bbee036ff1805743513f3af705b9bf9a
+  data.tar.gz: fea9f25a9715d7c19145c12736259f65e72dc942eae369d0125236ba25b96c2e68b7da66fbbb747b090360800d92cc2774a40befc99f013b82b485a7c291c38d

data/Gemfile.lock

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

data/lib/concurrent_worker/common.rb

@@ -12,8 +12,9 @@ module ConcurrentWorker
     end
     def pop
       Thread.handle_interrupt(Object => :never) do
-        @count.pop
+        r = @count.pop
         @com.push(true)
+        r
       end
     end
     
@@ -23,6 +24,11 @@ module ConcurrentWorker
         break if @count.size < n
       end
     end
+
+    def empty?
+      @count.empty?
+    end
+    
     def size
       @count.size
     end
@@ -35,15 +41,6 @@ module ConcurrentWorker
       @count.closed?
     end
 
-    def rest
-      result = []
-      until @count.empty?
-        req = @count.pop
-        next if req == []
-        result.push(req)
-      end
-      result
-    end    
   end
 
   class IPCDuplexChannel
@@ -61,23 +58,14 @@ module ConcurrentWorker
     
     def send(obj)
       begin
-        Thread.handle_interrupt(Object => :never) do
-          data = Marshal.dump(obj)
-          @wio.write([data.size].pack("I"))
-          @wio.write(data)
-        end
+        Marshal.dump(obj, @wio)
       rescue Errno::EPIPE
       end
     end
 
     def recv
       begin
-        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
+        Marshal.load(@rio)
       rescue IOError
         raise StopIteration
       end

data/lib/concurrent_worker/version.rb

@@ -1,3 +1,3 @@
 module ConcurrentWorker
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/concurrent_worker/worker.rb

@@ -1,6 +1,5 @@
 module ConcurrentWorker
   class Worker
-    attr_accessor :channel
     # Worker               : worker class
     #  +cncr_block         : concurrent processing block : thread(as ConcurrentThread)/process(as ConcurrentProcess)
     #    +base_block       : user defined preparation to exec 'work block'
@@ -11,7 +10,7 @@ module ConcurrentWorker
     # so that they can share instance variables:@xxxx.
     #
 
-    attr_reader :req_counter, :snd_queue_max
+    attr_reader :req_counter, :snd_queue_max, :undone_requests
 
     def queue_closed?
       @req_counter.closed?
@@ -20,7 +19,7 @@ module ConcurrentWorker
       !queue_closed? && @req_counter.size == 0
     end
     def queue_available?
-      !queue_closed? && @req_counter.size < @snd_queue_max
+      !queue_closed? && ( @snd_queue_max == 0 || @req_counter.size < @snd_queue_max )
     end
     
     def initialize(*args, **options, &work_block)
@@ -35,7 +34,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 
+      @options[:retired_callback_interrupt] ||= :immediate
+      @undone_requests = []
 
       case @options[:type]
       when :process
@@ -87,6 +87,13 @@ module ConcurrentWorker
         end
       end
     end
+    
+    def req_counter_close
+      @req_counter.close
+      until @req_counter.empty?
+        @undone_requests.push(@req_counter.pop)
+      end
+    end
 
     def result_handle_thread(&recv_block)
       Thread.new do
@@ -96,7 +103,7 @@ module ConcurrentWorker
               recv_block.call
             end
           ensure
-            @req_counter.close
+            req_counter_close
             channel_close
             call_retired_callbacks
           end
@@ -162,7 +169,7 @@ module ConcurrentWorker
       unless @state == :run
         run
       end
-      @req_counter.wait_until_less_than(@snd_queue_max)
+      @req_counter.wait_until_less_than(@snd_queue_max) if @snd_queue_max > 0
       begin 
         @req_counter.push([args, work_block])
         send_req([args, work_block])
@@ -186,11 +193,12 @@ module ConcurrentWorker
     
     def join
       unless @state == :run
-        return
+        return true
       end
       @req_counter.wait_until_less_than(1)
       quit
       wait_cncr_proc
+      true
     end
   end
 

data/lib/concurrent_worker/workerpool.rb

@@ -1,18 +1,35 @@
 module ConcurrentWorker
   class WorkerPool < Array
+    class ReadyWorkerQueue < Queue
+      alias :super_push :push
+      alias :super_pop  :pop
+      def initialize
+        super()
+        @m = Mutex.new
+      end
+      def push(arg)
+        @m.synchronize do
+          super_push(arg)
+        end
+      end
+      def pop
+        @m.synchronize do
+          queued = []
+          queued.push(super_pop) until empty?
+          queued.sort_by{ |w| w.req_counter.size }.each{ |w| super_push(w) }
+        end
+        super_pop
+      end
+    end
+    
 
     def need_new_worker?
       self.size < @max_num && self.select{ |w| w.queue_empty? }.empty?
     end
 
     def available_worker
-      delete_if{ |w| w.queue_closed? }
-      if need_new_worker?
-        w = deploy_worker
-        w.snd_queue_max.times do
-          @ready_queue.push(w)
-        end
-      end
+      delete_if{ |w| w.queue_closed? && w.join }
+      deploy_worker if need_new_worker?
       @ready_queue.pop
     end
     
@@ -47,7 +64,7 @@ module ConcurrentWorker
         @set_blocks.push([:work_block, work_block])
       end
 
-      @ready_queue = Queue.new
+      @ready_queue = ReadyWorkerQueue.new
       
       @result_callbacks = []
       
@@ -87,17 +104,20 @@ module ConcurrentWorker
       end
 
       w.add_retired_callback do
-        w.req_counter.rest.each do
+        w.undone_requests.each do
           |req|
           @snd_queue.push(req)
         end
-        @ready_queue.push(w)
       end
       
       @set_blocks.each do |symbol, block|
         w.set_block(symbol, &block)
       end
       w.run
+      
+      w.snd_queue_max.times do
+        @ready_queue.push(w)
+      end
       self.push(w)
       w
     end

metadata

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