ztk 1.16.2 → 1.17.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM4ZjAxYThhZjBkZDc2NTQ3MDhjYTlmYmYwYjUzNGIzMmQ4ZmIwYw==
+    YzBhZGNmNmVjYzgxMzk1MWI4MTBmMzE2ZTViMjVjYmY1NGUzMDc3ZA==
   data.tar.gz: !binary |-
-    NDllOTBjMjdjNzc2ZWVkYWE1Yzk5ODA3YWNkMzMzOTI1YTRlY2I0MQ==
+    ZGFkMjAxZGVmNDg3ZjRkODI0OWIxMTRhODA2ZmMzNDlhNTgzOGQyMQ==
 SHA512:
   metadata.gz: !binary |-
-    YmJkNzI3NzFlMWNhNmNlMGIzNzM2NTcwYzc1OTIxZGQzMTcxZjUzNTk1MWVl
-    ZTFhNzI5Mjc5MTFjOTkxODUyZGY3NWNjODg5NTU2YzBlNmNiZWRlZWM5ZDgx
-    MmNmMDZiM2Q1ZTYxMzIzOTVhMmE1MDQ3ZDMyMmUwMTc3MjFmZDA=
+    YjQzNDdkYzQxYmZlOGYzNWViZjRkZTlmODQ2MWE3MDcxNTdjZmQ1MWEzODg4
+    ZDU4ODI3MWZjYTA0NDlhODIyMjEwMjY1ZWRlOThhZDg4YmI3YmM2YWRjZDVh
+    YWE5NzU0ZGQzNTU0ZGYxMzU2NjQ4MTRjYmZmYWZkYmZjNmI5M2U=
   data.tar.gz: !binary |-
-    NDM3YjEwODQ0ZWRmMGZkYTU2N2ZjMWNjZTc5ZmU5NGY3NTU4YzFhMTFjY2Nm
-    ODk4MTZiNWYxYjhjZjIwZWQxMDQyYmNlZmRiZTM1M2EzY2JhZWU1OTY2Mzdi
-    NjUwNWRjMmNmMjZmNTZhMzIwZWIyMTY2OTI1ZWZjYjhmZjMyZjM=
+    MzFlYzc2NDVlYTkxN2Y1NTNmMzk1ODdmMzMzZThjOWIwMzM1MTdiZDYzMzI2
+    NDNlYmQxN2E3ZmRkNjdjYzVlMjQxMmNlNWQ2YjYxOThjZGZkZmMwMjkzYWJh
+    MGQyMzUwMGNlMDlhOGQxMTdjYTFmZDM0MWU1NTBhMzFkNWQ0Nzc=

data/lib/ztk/parallel.rb

@@ -96,6 +96,20 @@ module ZTK
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Parallel < ZTK::Base
 
+    class Break < ParallelError; end
+
+    # Tests if we can marshal an exception via the results; otherwise creates
+    # an exception we can marshal.
+    class ExceptionWrapper
+      attr_reader :exception
+
+      def initialize(exception)
+        dumpable = (Marshal.dump(exception) rescue nil)
+        dumpable.nil? and (exception = RuntimeError.new(exception.inspect))
+        @exception = exception
+      end
+    end
+
     # Default Maximum Number of Forks
     MAX_FORKS = case RUBY_PLATFORM
     when /darwin/ then
@@ -129,6 +143,15 @@ module ZTK
       @forks = Array.new
       @results = Array.new
       GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true
+
+      %w( kill term int hup ).map(&:upcase).each do |signal|
+        Signal.trap(signal) do
+          $stderr.puts("SIG#{signal} received by PID##{Process.pid}; aborting parallel executing...")
+
+          signal_all(signal)
+          exit!(1)
+        end
+      end
     end
 
     # Process in parallel.
@@ -151,18 +174,27 @@ 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
 
-        if !(data = block.call).nil?
+        data = nil
+        begin
+          data = block.call
+        rescue Exception => e
+          data = ExceptionWrapper.new(e)
+        end
+
+        if !data.nil?
           config.ui.logger.debug { "write(#{data.inspect})" }
           child_writer.write(Base64.encode64(Marshal.dump(data)))
         end
 
         child_reader.close
         child_writer.close
+
         Process.exit!(0)
       end
       config.after_fork and config.after_fork.call(Process.pid)
@@ -188,10 +220,14 @@ module ZTK
       config.ui.logger.debug { "wait" }
       config.ui.logger.debug { "forks(#{@forks.inspect})" }
       pid, status = (Process.wait2(-1) rescue nil)
+
       if !pid.nil? && !status.nil? && !(fork = @forks.select{ |f| f[:pid] == pid }.first).nil?
         data = (Marshal.load(Base64.decode64(fork[:reader].read.to_s)) rescue nil)
         config.ui.logger.debug { "read(#{data.inspect})" }
+
+        process_exception_data(data)
         !data.nil? and @results.push(data)
+
         fork[:reader].close
         fork[:writer].close
 
@@ -212,6 +248,24 @@ module ZTK
       @results
     end
 
+    # Signals all forks.
+    #
+    # @return [Integer] The number of processes signaled.
+    def signal_all(signal="KILL")
+      signaled = 0
+      if (!@forks.nil? && (@forks.count > 0))
+        @forks.each do |fork|
+          begin
+            Process.kill(signal, fork[:pid])
+            signaled += 1
+          rescue
+            nil
+          end
+        end
+      end
+      signaled
+    end
+
     # Count of active forks.
     #
     # @return [Integer] Current number of active forks.
@@ -220,6 +274,18 @@ module ZTK
       @forks.count
     end
 
+
+  private
+
+    def process_exception_data(data)
+      return if !(ZTK::Parallel::ExceptionWrapper === data)
+
+      config.ui.logger.fatal { "exception(#{data.exception.inspect})" }
+
+      signal_all
+      raise data.exception
+    end
+
   end
 
 end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.16.2"
+  VERSION = "1.17.0"
 
 end

data/spec/ztk/parallel_spec.rb

@@ -22,7 +22,10 @@ require "spec_helper"
 
 describe ZTK::Parallel do
 
-  subject { ZTK::Parallel.new }
+  subject {
+    ui = ZTK::UI.new(:logger => $logger)
+    ZTK::Parallel.new(:ui => ui)
+  }
 
   describe "class" do
 
@@ -56,6 +59,26 @@ describe ZTK::Parallel do
         subject.results.include?(Process.pid).should be false
       end
 
+      it "should stop all execution when the ZTK::Parallel::Break exception is raised" do
+        3.times do |x|
+          subject.process do
+            raise ZTK::Parallel::Break
+          end
+        end
+
+        lambda { subject.waitall }.should raise_error
+      end
+
+      it "should stop all execution when any exception is raised" do
+        3.times do |x|
+          subject.process do
+            raise "SomeException"
+          end
+        end
+
+        lambda { subject.waitall }.should raise_error
+      end
+
     end
 
     describe "#wait" do
@@ -67,7 +90,7 @@ describe ZTK::Parallel do
           end
         end
 
-        3.times do
+        while subject.count > 0 do
           subject.wait
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport