parallel 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41798e8a531680e30ebcc41d1fa32527a03b062e
-  data.tar.gz: 9573be00fe55ad7bfac10b11af093bf729085b24
+  metadata.gz: 0e98f73ce25c329aab14185e79d68643dde8b705
+  data.tar.gz: bcf7f3490b62a267b9c54b82114c25193fdef811
 SHA512:
-  metadata.gz: c11b276f31a4f08ff4d91a33626c0daab3a903d1b1f5e7b0450f3837ab5076cefa9fcd458decff08444d62c4a9f28eb2c9447b7f4f7e7fcafbe96c9e8d53e918
-  data.tar.gz: 24b9dfdd2058018a3eba26d9cb2177f1fcab0b95517630704facec2ab1c3254251503cb2881e9574f2b13f8cd023ddcd18fa5b71480aa36161fed260bbcf2cf3
+  metadata.gz: 6209b06e7fd1a09a92c1e485c156b4abc57ba5c230f21ae6d7df5752d06acaf2adc55771230bda207a37a770b0a3241cad33e0d27da125ed1c8642c848f16633
+  data.tar.gz: 6e08572a7a48ce2d5da1e325c02ab701297854fd5e22397835e48d361f86968a79fb764a5c2df91f4cfbf81ff31d9f5bb3ed39ed86f570ffc075c29084fb049f

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-�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�=��㕆�ޠ
+�D���N�3SL���{���,���E�v�ܑ ��4)^��|�zo �k��A�!�u�7�^��ν4��7�R��3
�N(��k����mN�`JjN�
+ ���G@:�p�L���Z���.�a�����hZ��h]@���h���>�y �ϻ���U�
+�fhZ����3�F�=4t7

data/lib/parallel.rb

@@ -26,7 +26,7 @@ module Parallel
 
   class Worker
     attr_reader :pid, :read, :write
-    attr_accessor :silent_death
+    attr_accessor :thread
     def initialize(read, write, pid)
       @read, @write, @pid = read, write, pid
     end
@@ -52,7 +52,7 @@ module Parallel
       begin
         Marshal.load(read)
       rescue EOFError
-        raise DeadWorker unless silent_death
+        raise DeadWorker
       end
     end
   end
@@ -250,6 +250,7 @@ module Parallel
       kill_on_ctrl_c(workers.map(&:pid)) do
         in_threads(options[:count]) do |i|
           worker = workers[i]
+          worker.thread = Thread.current
 
           begin
             loop do
@@ -264,8 +265,10 @@ module Parallel
               if ExceptionWrapper === output
                 exception = output.exception
                 if Parallel::Kill === exception
-                  workers.each { |w| w.silent_death = true }
-                  kill_everything_we_spawned
+                  (workers - [worker]).each do |w|
+                    kill_that_thing!(w.thread)
+                    kill_that_thing!(w.pid)
+                  end
                 end
               else
                 results[index] = output
@@ -364,7 +367,7 @@ module Parallel
         Signal.trap :SIGINT do
           if @to_be_killed.any?
             $stderr.puts 'Parallel execution interrupted, exiting ...'
-            kill_everything_we_spawned
+            @to_be_killed.flatten.compact.each { |thing| kill_that_thing!(thing) }
           end
           exit 1 # Quit with 'failed' signal
         end
@@ -374,13 +377,6 @@ 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.1'
+  VERSION = Version = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it