parallel 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05382db7d0b4b4f68df10928de7361d70ccac05f
-  data.tar.gz: 5e2ad497c0cd970096597b55463dc8537eb28a13
+  metadata.gz: 1cfb32f76c7f232bcd3f44e8370af1e61882de3a
+  data.tar.gz: edab2b1cf2013b37cb7a58908750bfb1221327a8
 SHA512:
-  metadata.gz: 95cd753742bca781538717f438151e16088fa4a952e75047654731e38b53a6beaf6d551ead69c332f6d1f7563d83dfae5e4b5b34138dceb14a944e3c0804d935
-  data.tar.gz: f13c32555e567c9a14f61a3315cb2b90a353d3f8fa6022ff1a7735e66de189b303592c400d11fa34610544a898e200e75df23dac719d5fcd44a9230be52dc6fe
+  metadata.gz: 99aa1aaefc20811d7540d607521f76b0edf10b09f5e96d1997341b5a12305d136355ae62e54380d5095111840d2258f8aa09e7a36abff52fdd79cb8f3d392c30
+  data.tar.gz: 3f4255effe94025fa160ec1ef0f47a1a319c7036a4910f762b95218a7ddcc7b118edc60fb884b2ba8af39959e6b74b51d7b16d1dd8d235ed89ec28505997019f

data/lib/parallel.rb

@@ -35,15 +35,16 @@ module Parallel
       @read, @write, @pid = read, write, pid
     end
 
-    def close_pipes
-      read.close
-      write.close
+    def stop
+      close_pipes
+      wait # if it goes zombie, rather wait here to be able to debug
     end
 
-    def wait
-      Process.wait(pid)
-    rescue Interrupt
-      # process died
+    # might be passed to started_processes and simultaneously closed by another thread
+    # when running in isolation mode, so we have to check if it is closed before closing
+    def close_pipes
+      read.close unless read.closed?
+      write.close unless write.closed?
     end
 
     def work(data)
@@ -61,6 +62,14 @@ module Parallel
       raise result.exception if ExceptionWrapper === result
       result
     end
+
+    private
+
+    def wait
+      Process.wait(pid)
+    rescue Interrupt
+      # process died
+    end
   end
 
   class JobFactory
@@ -300,7 +309,11 @@ module Parallel
     end
 
     def work_in_processes(job_factory, options, &blk)
-      workers = create_workers(job_factory, options, &blk)
+      workers = if options[:isolation]
+        [] # we create workers per job and not beforehand
+      else
+        create_workers(job_factory, options, &blk)
+      end
       results = []
       results_mutex = Mutex.new # arrays are not thread-safe
       exception = nil
@@ -308,7 +321,6 @@ module Parallel
       UserInterruptHandler.kill_on_ctrl_c(workers.map(&:pid), options) do
         in_threads(options) do |i|
           worker = workers[i]
-          worker.thread = Thread.current
 
           begin
             loop do
@@ -316,6 +328,12 @@ module Parallel
               item, index = job_factory.next
               break unless index
 
+              if options[:isolation]
+                worker = replace_worker(job_factory, workers, i, options, blk)
+              end
+
+              worker.thread = Thread.current
+
               begin
                 result = with_instrumentation item, index, options do
                   worker.work(job_factory.pack(item, index))
@@ -332,8 +350,7 @@ module Parallel
               end
             end
           ensure
-            worker.close_pipes
-            worker.wait # if it goes zombie, rather wait here to be able to debug
+            worker.stop if worker
           end
         end
       end
@@ -341,6 +358,16 @@ module Parallel
       handle_exception(exception, results)
     end
 
+    def replace_worker(job_factory, workers, i, options, blk)
+      # old worker is no longer used ... stop it
+      worker = workers[i]
+      worker.stop if worker
+
+      # create a new replacement worker
+      running = workers - [worker]
+      workers[i] = worker(job_factory, options.merge(started_workers: running), &blk)
+    end
+
     def create_workers(job_factory, options, &block)
       workers = []
       Array.new(options[:count]).each do

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.7.0'
+  VERSION = Version = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it