parallel 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4485e35ba1d52d6b8267884c3371533ca3e76fdc
-  data.tar.gz: b6e4de966f97b0c09cbb8c561efc275de370bed2
+  metadata.gz: 0f363b126a1d42e09e74864a71c940edaf139d79
+  data.tar.gz: a8976de6367828f3ef06b8eb81822515817b1afc
 SHA512:
-  metadata.gz: e024ac38c60e101d73719bb368ef6ec482f7fac471dc2a72dfe0b760ec12e29f75864bd35d1e483ca478fe0e2a594e0cd021d046bf048aaea602ac334aaa9e59
-  data.tar.gz: fd4fa3446693012160debe76cc48a1abd0c1d80632b94cf2189b375e2202e8c5fec2af8dd4e689414b3fb399b25379edc8f890b2d472a4edfb5e6866a1b7f07f
+  metadata.gz: 0a78ebb2abf7b12749b4ffb318eb70b8b04f00af516dcf438423080a26136bd2a87a097e9b593130294eaf4e9a1e97a754da7c8f7a7a46c7d7b84f5446bdd224
+  data.tar.gz: 3eb8871382f2669e89fecca80bc2dfe198c05df133795e55fd12bd283d0760d7a9c5035c2abc337431b57048647b343ea9022a3ca83bf4da875c53d8a47c3b0c

data/lib/parallel.rb

@@ -123,41 +123,31 @@ module Parallel
 
     class << self
       # kill all these pids or threads if user presses Ctrl+c
-      def kill_on_ctrl_c(things, options)
-        return yield if RUBY_ENGINE == "jruby"
-
-        begin
-          @to_be_killed ||= []
-          old_interrupt = nil
-          signal = options.fetch(:interrupt_signal, INTERRUPT_SIGNAL)
-
-          if @to_be_killed.empty?
-            old_interrupt = trap_interrupt(signal) do
-              $stderr.puts 'Parallel execution interrupted, exiting ...'
-              @to_be_killed.flatten.compact.each { |thing| kill(thing) }
-            end
+      def kill_on_ctrl_c(pids, options)
+        @to_be_killed ||= []
+        old_interrupt = nil
+        signal = options.fetch(:interrupt_signal, INTERRUPT_SIGNAL)
+
+        if @to_be_killed.empty?
+          old_interrupt = trap_interrupt(signal) do
+            $stderr.puts 'Parallel execution interrupted, exiting ...'
+            @to_be_killed.flatten.each { |pid| kill(pid) }
           end
+        end
 
-          @to_be_killed << things
+        @to_be_killed << pids
 
-          yield
-        ensure
-          @to_be_killed.pop # free threads for GC and do not kill pids that could be used for new processes
-          restore_interrupt(old_interrupt, signal) if @to_be_killed.empty?
-        end
+        yield
+      ensure
+        @to_be_killed.pop # do not kill pids that could be used for new processes
+        restore_interrupt(old_interrupt, signal) if @to_be_killed.empty?
       end
 
       def kill(thing)
-        if thing.is_a?(Thread)
-          thing.kill
-        else
-          begin
-            Process.kill(:KILL, thing)
-          rescue Errno::ESRCH
-            # some linux systems already automatically killed the children at this point
-            # so we just ignore them not being there
-          end
-        end
+        Process.kill(:KILL, thing)
+      rescue Errno::ESRCH
+        # some linux systems already automatically killed the children at this point
+        # so we just ignore them not being there
       end
 
       private
@@ -185,20 +175,10 @@ module Parallel
 
   class << self
     def in_threads(options={:count => 2})
-      count, options = extract_count_from_options(options)
-
-      out = []
-      threads = []
-
-      count.times do |i|
-        threads[i] = Thread.new do
-          out[i] = yield(i)
-        end
-      end
-
-      UserInterruptHandler.kill_on_ctrl_c(threads, options) { wait_for_threads(threads) }
-
-      out
+      count, _ = extract_count_from_options(options)
+      Array.new(count).each_with_index.map do |_, i|
+        Thread.new { yield(i) }
+      end.map!(&:value)
     end
 
     def in_processes(options = {}, &block)
@@ -291,6 +271,7 @@ module Parallel
     end
 
     def work_in_threads(job_factory, options, &block)
+      raise "interrupt_signal is no longer supported for threads" if options[:interrupt_signal]
       results = []
       exception = nil
 
@@ -335,7 +316,7 @@ module Parallel
                 exception = e
                 if Parallel::Kill === exception
                   (workers - [worker]).each do |w|
-                    UserInterruptHandler.kill(w.thread)
+                    w.thread.kill
                     UserInterruptHandler.kill(w.pid)
                   end
                 end
@@ -396,18 +377,6 @@ module Parallel
       end
     end
 
-    def wait_for_threads(threads)
-      interrupted = threads.compact.map do |t|
-        begin
-          t.join
-          nil
-        rescue Interrupt => e
-          e # thread died, do not stop other threads
-        end
-      end.compact
-      raise interrupted.first if interrupted.first
-    end
-
     def handle_exception(exception, results)
       return nil if [Parallel::Break, Parallel::Kill].include? exception.class
       raise exception if exception

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.5.1'
+  VERSION = Version = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it