parallel 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6eba22bc6a58bd81015a14fc172be0e153d91d
-  data.tar.gz: 7141912375eb2e22d01c1cec0adc9de9959cdd3f
+  metadata.gz: 41798e8a531680e30ebcc41d1fa32527a03b062e
+  data.tar.gz: 9573be00fe55ad7bfac10b11af093bf729085b24
 SHA512:
-  metadata.gz: 0928cea0bdb78c8f2eca63f3a4fc91c77762d775d1290ba98ee9b4e827d1dc34a411909ed8eb7769fc30039859731a1b50e7bb7b0e559451a17ca78fd3a4dacf
-  data.tar.gz: 0703748023b1f658f47aba8ee163b1d2ca7a349343f76efdcd5397474fcb44b21a76a026fcf14d22cf09b64db80c047f3111ac22802779a5da9386dca839b374
+  metadata.gz: c11b276f31a4f08ff4d91a33626c0daab3a903d1b1f5e7b0450f3837ab5076cefa9fcd458decff08444d62c4a9f28eb2c9447b7f4f7e7fcafbe96c9e8d53e918
+  data.tar.gz: 24b9dfdd2058018a3eba26d9cb2177f1fcab0b95517630704facec2ab1c3254251503cb2881e9574f2b13f8cd023ddcd18fa5b71480aa36161fed260bbcf2cf3

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-1O�9ڥ9�џ؍�N@nVr�c2]>ȗ@��ɻ�^���n$��ߓi{
���#�QJ`u��4�����6a�B�[����cb3��l=3h� 5���*���7[�ێ�d�<fWX8�>5^s�ݯ�����Ҭ���n�9�xB?�;}@������׉�	�b.����~��ҧ�M�|Ѡ�p3f N�j��p2y!��>��ӰT7�����cK�X}��&���9�=���m�F�d �5&r�\��.
+�c��n<RAI��_�A���X~8�D��{ǰP{����s�
+��l�U����ȳ���������7Iae&ċIV�ͅ�O��G ����$���(�P��OUW����R���K=�i�\��v�$<�xa��bXԓ䙰�HT�z�<	��w�JLG�w�G��Ym�}���D�BG�M��^�%�W-jϷ���=��J� r~�U�4y�K�:@��&ɨT�d������o$�D<3>%���c����s�=��㕆�ޠ

data/lib/parallel.rb

@@ -9,6 +9,9 @@ module Parallel
   class Break < StandardError
   end
 
+  class Kill < StandardError
+  end
+
   class ExceptionWrapper
     attr_reader :exception
     def initialize(exception)
@@ -23,6 +26,7 @@ module Parallel
 
   class Worker
     attr_reader :pid, :read, :write
+    attr_accessor :silent_death
     def initialize(read, write, pid)
       @read, @write, @pid = read, write, pid
     end
@@ -48,7 +52,7 @@ module Parallel
       begin
         Marshal.load(read)
       rescue EOFError
-        raise DeadWorker
+        raise DeadWorker unless silent_death
       end
     end
   end
@@ -227,7 +231,7 @@ module Parallel
           with_instrumentation items[index], index, options do
             begin
               results[index] = call_with_index(items, index, options, &block)
-            rescue Exception => e
+            rescue StandardError => e
               exception = e
               break
             end
@@ -259,6 +263,10 @@ module Parallel
 
               if ExceptionWrapper === output
                 exception = output.exception
+                if Parallel::Kill === exception
+                  workers.each { |w| w.silent_death = true }
+                  kill_everything_we_spawned
+                end
               else
                 results[index] = output
               end
@@ -331,7 +339,7 @@ module Parallel
     end
 
     def handle_exception(exception, results)
-      return nil if exception.class == Parallel::Break
+      return nil if [Parallel::Break, Parallel::Kill].include? exception.class
       raise exception if exception
       results
     end
@@ -356,7 +364,7 @@ module Parallel
         Signal.trap :SIGINT do
           if @to_be_killed.any?
             $stderr.puts 'Parallel execution interrupted, exiting ...'
-            @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
+            kill_everything_we_spawned
           end
           exit 1 # Quit with 'failed' signal
         end
@@ -366,6 +374,13 @@ module Parallel
       @to_be_killed.pop # free threads for GC and do not kill pids that could be used for new processes
     end
 
+    def kill_everything_we_spawned
+      if defined?(@to_be_killed)
+        @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
+        @to_be_killed = [] # in case the ctrl+c kicks in later ...
+      end
+    end
+
     def kill_that_thing!(thing)
       if thing.is_a?(Thread)
         thing.kill

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.1.0'
+  VERSION = Version = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Grosser