rbbt-util 5.23.0 → 5.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7397119676c0da57371a52797ef8a3f4dc2bc0a
-  data.tar.gz: 973e8a7c4e2cb6eb960ed2b7c782dae0a615c0ac
+  metadata.gz: 1387c90c7d1b469409501f758b509242302e74b1
+  data.tar.gz: 8a8c064c4bb2d8ef569c6d6caa23804cec847f81
 SHA512:
-  metadata.gz: 26497c36b05b98961b845562930dceb399c720ab399c5a71c16ccbefb6e5b9756c407ca4fd1ca5b679ef1fca5ea1c989fd1cd4b28b33d8ae983d82cdcfa99aa8
-  data.tar.gz: 37a2aa35faac67658a57ef32d2ab662968a4a11ba44a6a1174d79cdfd86a4315f8ee2b57b3f870b928a4e7b1138ceb5f81f12b513beff95bf00171839083bc9b
+  metadata.gz: 0beeca3f823da88c8cfc94cbc8eefd30692a736eff13ac648a7592985ca4585dc4b7ba72ca2ce990e915b8ee5307e87b920b6bc835bd469807654a0b41b710d5
+  data.tar.gz: 851277c016a171d1db79e3f16d33ef8f967fff05eaba1c33d70d73c7851a3a19153de0ae01902d9d4903ef0e93ecf57c7ddd920ca1a60516aca84e066aa2f21e

data/lib/rbbt/util/concurrency/processes.rb

@@ -3,16 +3,19 @@ require 'rbbt/util/concurrency/processes/socket'
 
 class RbbtProcessQueue
 
-  attr_accessor :num_processes, :processes, :queue, :process_monitor, :cleanup, :join, :reswpan, :offset
+  attr_accessor :num_processes, :queue, :process_monitor, :cleanup, :join, :reswpan, :offset
   def initialize(num_processes, cleanup = nil, join = nil, reswpan = nil, offset = false)
     @num_processes = num_processes
-    @processes = []
     @cleanup = cleanup
     @join = join
     @respawn = reswpan
     @offset = offset
     @queue = RbbtProcessSocket.new
-    @process_mutex = Mutex.new
+
+    key = "/" << rand(1000000000).to_s << '.' << Process.pid.to_s;
+    @sem = key + '.process'
+    Log.debug "Creating process semaphore: #{@sem}"
+    RbbtSemaphore.create_semaphore(@sem,1)
   end
 
 
@@ -66,16 +69,25 @@ class RbbtProcessQueue
   def init(&block)
     @init_block = block
 
+    RbbtSemaphore.wait_semaphore(@sem)
     @master_pid = Process.fork do
       @close_up = false
+      processes_initiated = false
+      process_mutex = Mutex.new
 
       Signal.trap(CLOSE_SIGNAL) do
-        @close_up = true unless @closing_thread
-        Misc.insist([0,0.01,0.1,0.2,0.5]) do
-          raise TryAgain unless @manager_thread
-          if @manager_thread.alive?
-            raise "Manager thread for #{Process.pid} Not working yet" unless @manager_thread["working"]
-            @manager_thread.raise TryAgain
+        if ! @closing_thread
+          @close_up = true 
+          Misc.insist([0,0.01,0.1,0.2,0.5]) do
+            if ! @manager_thread
+              Thread.pass 
+              raise "Manager thread for #{Process.pid} not found yet" 
+            end
+
+            if @manager_thread.alive?
+              raise "Manager thread for #{Process.pid} not working yet" unless @manager_thread["working"]
+              @manager_thread.raise TryAgain
+            end
           end
         end
       end
@@ -91,23 +103,20 @@ class RbbtProcessQueue
       end
 
       Signal.trap(ABORT_SIGNAL) do
-        begin
-          @monitor_thread.raise Aborted
-        rescue Exception
-          Log.exception $!
+        Misc.insist([0,0.01,0.1,0.2,0.5]) do
+          @monitor_thread.raise Aborted if @monitor_thread && @monitor_thread.alive?
         end
       end
 
-
       if @callback_queue
-        Misc.purge_pipes(@queue.swrite,@queue.sread,@callback_queue.swrite, @callback_queue.sread) 
+        Misc.purge_pipes(@queue.swrite, @queue.sread, @callback_queue.swrite, @callback_queue.sread) 
       else
-        Misc.purge_pipes(@queue.swrite,@queue.sread) 
+        Misc.purge_pipes(@queue.swrite, @queue.sread) 
       end
 
-      @total = num_processes
+      @total = 0
       @count = 0
-      @processes = []
+      processes = []
 
       @manager_thread = Thread.new do
         begin
@@ -115,15 +124,19 @@ class RbbtProcessQueue
           begin
             Thread.current["working"] = true
             if @close_up
-              @close_up = false
-              Log.debug "Closing up process queue #{Process.pid}"
-              @count = 0
-              @closing_thread = Thread.new do
-                Log.debug "Pushing closed stream #{Process.pid}"
-                while true
-                  @queue.push ClosedStream.new unless @queue.cleaned 
-                  break if @processes.empty?
-                end unless @processes.empty?
+              Thread.handle_interrupt(TryAgain => :never) do
+                Log.debug "Closing up process queue #{Process.pid}"
+                @count = 0
+                @closing_thread = Thread.new do
+                  Thread.handle_interrupt(TryAgain => :never) do
+                    Log.debug "Pushing closed stream #{Process.pid}"
+                    while true
+                      @queue.push ClosedStream.new unless @queue.cleaned 
+                      break if processes_initiated && processes.empty?
+                    end unless processes_initiated && processes.empty?
+                  end
+                end
+                @close_up = false
               end
             end
 
@@ -134,20 +147,22 @@ class RbbtProcessQueue
 
             raise TryAgain if @close_up
 
-            @process_mutex.synchronize do
-              while @count > 0
-                @count -= 1
-                @total += 1
-                @processes << RbbtProcessQueueWorker.new(@queue, @callback_queue, @cleanup, @respawn, @offset, &@init_block)
-                Log.warn "Added process #{@processes.last.pid} to #{Process.pid} (#{@processes.length})"
-              end
-
-              while @count < 0
-                @count += 1
-                next unless @processes.length > 1
-                first = @processes.shift
-                first.stop
-                Log.warn "Removed process #{first.pid} from #{Process.pid} (#{@processes.length})"
+            process_mutex.synchronize do
+              Thread.handle_interrupt(TryAgain => :never) do
+                while @count > 0
+                  @count -= 1
+                  @total += 1
+                  processes << RbbtProcessQueueWorker.new(@queue, @callback_queue, @cleanup, @respawn, @offset, &@init_block)
+                  Log.warn "Added process #{processes.last.pid} to #{Process.pid} (#{processes.length})"
+                end
+
+                while @count < 0
+                  @count += 1
+                  next unless processes.length > 1
+                  first = processes.shift
+                  first.stop
+                  Log.warn "Removed process #{first.pid} from #{Process.pid} (#{processes.length})"
+                end
               end
             end
           rescue TryAgain
@@ -169,34 +184,38 @@ class RbbtProcessQueue
       @callback_queue.close_read if @callback_queue
 
       num_processes.times do |i|
-        @process_mutex.synchronize do
-          @processes << RbbtProcessQueueWorker.new(@queue, @callback_queue, @cleanup, @respawn, @offset, &@init_block)
+        @total += 1 
+        process_mutex.synchronize do
+          processes << RbbtProcessQueueWorker.new(@queue, @callback_queue, @cleanup, @respawn, @offset, &@init_block)
         end
       end
 
+      processes_initiated = true
+
       @monitor_thread = Thread.new do
         begin
-          while @processes.any?
-            @processes[0].join 
-            @processes.shift
+          while processes.any?
+            processes[0].join 
+            processes.shift
           end
         rescue Aborted
           Log.warn "Aborting process monitor"
-          @processes.each{|p| p.abort_and_join}
-          @processes.clear
+          processes.each{|p| p.abort_and_join}
+          processes.clear
 
           @callback_thread.kill if @callback_thread && @callback_thread.alive?
           @manager_thread.kill if @manager_thread.alive?
         rescue Exception
           Log.warn "Process monitor exception: #{$!.message}"
-          @processes.each{|p| p.abort_and_join}
-          @processes.clear
+          processes.each{|p| p.abort_and_join}
+          processes.clear
 
           @callback_thread.kill if @callback_thread && @callback_thread.alive?
           @manager_thread.kill if @manager_thread.alive?
         end
       end
 
+      RbbtSemaphore.post_semaphore(@sem)
 
       begin
 
@@ -233,7 +252,7 @@ class RbbtProcessQueue
       Log.warn "Error closing callback: #{$!.message}"
     end
     @callback_thread.join  if @callback_thread && @callback_thread.alive?
-    t.join
+    t.join if t && t.alive?
   end
 
   def _join
@@ -265,7 +284,9 @@ class RbbtProcessQueue
 
   def join
     begin
-      Process.kill CLOSE_SIGNAL, @master_pid
+      RbbtSemaphore.synchronize(@sem) do
+        Process.kill CLOSE_SIGNAL, @master_pid
+      end
     rescue Errno::ECHILD, Errno::ESRCH
       Log.debug "Cannot kill #{@master_pid}: #{$!.message}"
     end 
@@ -296,6 +317,7 @@ class RbbtProcessQueue
   end
 
   def clean
+    RbbtSemaphore.delete_semaphore(@sem)
     begin
       self.abort if Misc.pid_exists?(@master_pid)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.23.0
+  version: 5.23.1
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake