ztk 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb1bbfa5948f9298b26619d12e86a680366e12d
-  data.tar.gz: c1c6fe133bee76e3c5fe69b4d081639e00f6fe40
+  metadata.gz: d760f1f213971dc97e6eeef8759269b2f73572e3
+  data.tar.gz: a50b3d2e09579bb30f39a1bcb1c9af5d2a433248
 SHA512:
-  metadata.gz: 4adcc39b3c753ffef8b5a1fa2acbbc4546f8c847a65ec17c6081125c4e1cd8fdcb31650e2d4d0430406af9dfb0c4c9a0fbcc6f1fd00ef78d9b29b1822b484ce3
-  data.tar.gz: 4a243a18dc8d59269e454c0f6f1a75eeee71cfd1816757cce87799a0953c2255cd658cc3919c2b602d08625bb4aa6827f0ba155f51c0179ed3e294e7ef2c9afc
+  metadata.gz: 571f41f9f17350346888a4eb77e7434374599557bb11a0c18d359c16f14942712fbc21f03d9af4d75c0735a2802010aa0040af8558a7c0a2eb8631b4e4141dc7
+  data.tar.gz: 80c28ff3598abeb9a3374afc3d9b29fb7a34f729d3f6f7e7ed2a985769bb08510daa2db5316e658d63d85082ca482baa2e7618e710903f7cc3ff97ae0438b7c5

data/lib/ztk/parallel.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'timeout'
 
 module ZTK
 
@@ -47,6 +48,7 @@ module ZTK
   class Parallel < ZTK::Base
 
     class Break < ParallelError; end
+    class Timeout < ParallelError; end
 
     # Tests if we can marshal an exception via the results; otherwise creates
     # an exception we can marshal.
@@ -65,7 +67,7 @@ module ZTK
     when /darwin/ then
       (%x( sysctl hw.ncpu ).strip.split(':').last.strip.to_i - 1)
     when /linux/ then
-      (%x( grep -c processor /proc/cpuinfo ).strip.strip.to_i - 1)
+      (%x( grep -c processor /proc/cpuinfo ).strip.to_i - 1)
     end
 
     # Platforms memory capacity in bytes
@@ -76,6 +78,14 @@ module ZTK
       (%x( grep MemTotal /proc/meminfo ).strip.split[1].to_i * 1024)
     end
 
+    # Child process timeout in seconds; <= 0 to disable
+    DEFAULT_CHILD_TIMEOUT = 0
+
+    # Which signals we want to trap for child signaling
+    trapped_signals = %w( term int hup )
+    trapped_signals << "kill" if RUBY_VERSION < "2.2.0"
+    TRAPPED_SIGNALS = trapped_signals.map(&:upcase)
+
     # Result Set
     attr_accessor :results
 
@@ -86,7 +96,8 @@ module ZTK
     def initialize(configuration={})
       super({
         :max_forks        => MAX_FORKS,
-        :raise_exceptions => true
+        :raise_exceptions => true,
+        :child_timeout    => DEFAULT_CHILD_TIMEOUT
       }, configuration)
 
       (config.max_forks < 1) and log_and_raise(ParallelError, "max_forks must be equal to or greater than one!")
@@ -95,16 +106,13 @@ module ZTK
       @results = Array.new
       GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true
 
-      trapped_signals = %w( term int hup )
-      trapped_signals << "kill" if RUBY_VERSION < "2.2.0"
-
-      trapped_signals.map(&:upcase).each do |signal|
+      TRAPPED_SIGNALS.each do |signal|
         Signal.trap(signal) do
           $stderr.puts("SIG#{signal} received by PID##{Process.pid}; signaling child processes...")
 
           signal_all(signal)
 
-          exit!(1)
+          (signal == "INT") or exit!(1)
         end
       end
     end
@@ -129,37 +137,45 @@ module ZTK
 
       config.before_fork and config.before_fork.call(Process.pid)
       pid = Process.fork do
-
-        config.after_fork and config.after_fork.call(Process.pid)
-
-        parent_writer.close
-        parent_reader.close
-
-        data = nil
         begin
-          data = block.call
-        rescue Exception => e
-          config.ui.logger.fatal { e.message }
-          e.backtrace.each do |line|
-            config.ui.logger << line
-            config.ui.logger << "\n"
+          TRAPPED_SIGNALS.each { |signal| Signal.trap(signal) { } }
+
+          parent_writer.close
+          parent_reader.close
+
+          ::Timeout.timeout(config.child_timeout, ZTK::Parallel::Timeout) do
+            config.after_fork and config.after_fork.call(Process.pid)
+
+            data = nil
+            begin
+              data = block.call
+            rescue Exception => e
+              config.ui.logger.fatal { e.message }
+              e.backtrace.each do |line|
+                config.ui.logger << "#{line}\n"
+              end
+              data = ExceptionWrapper.new(e)
+            end
+
+            if !data.nil?
+              config.ui.logger.debug { "write(#{data.inspect})" }
+              begin
+                child_writer.write(Base64.encode64(Marshal.dump(data)))
+              rescue Exception => e
+                config.ui.logger.warn { "Exception while writing data to child_writer! - #{e.inspect}" }
+              end
+            end
           end
-          data = ExceptionWrapper.new(e)
-        end
 
-        if !data.nil?
-          config.ui.logger.debug { "write(#{data.inspect})" }
-          begin
-            child_writer.write(Base64.encode64(Marshal.dump(data)))
-          rescue Exception => e
-            config.ui.logger.warn { "Exception while writing data to child_writer! - #{e.inspect}" }
-          end
-        end
+        rescue Exception => e
+          config.ui.logger.fatal { "Exception in Child Process Handler: #{e.inspect}" }
 
-        child_reader.close
-        child_writer.close
+        ensure
+          child_reader.close rescue nil
+          child_writer.close rescue nil
 
-        Process.exit!(0)
+          Process.exit!(0)
+        end
       end
       config.after_fork and config.after_fork.call(Process.pid)
 

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport