parallel 0.6.5 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel (0.6.5)
+    parallel (0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -78,7 +78,7 @@ gem install ruby-progressbar
 ```Ruby
 require 'ruby-progressbar'
 progress = ProgressBar.create(:title => "The Progress", :total => 100)
-Parallel.map(1..100, :finish => lambda { |i, item| progress.increment }) { sleep 1 }
+Parallel.map(1..100, :finish => lambda { |item, i| progress.increment }) { sleep 1 }
 ```
 
 Tips

data/lib/parallel.rb

@@ -66,7 +66,7 @@ module Parallel
         end
       end
 
-      wait_for_threads(threads)
+      kill_on_ctrl_c(threads) { wait_for_threads(threads) }
 
       out
     end
@@ -196,29 +196,30 @@ module Parallel
       current_index = -1
       results = []
       exception = nil
+      kill_on_ctrl_c(workers.map(&:pid)) do
+        in_threads(options[:count]) do |i|
+          worker = workers[i]
 
-      in_threads(options[:count]) do |i|
-        worker = workers[i]
-
-        begin
-          loop do
-            break if exception
-            index = Thread.exclusive{ current_index += 1 }
-            break if index >= items.size
-
-            output = with_instrumentation items[index], index, options do
-              worker.work(index)
-            end
-
-            if ExceptionWrapper === output
-              exception = output.exception
-            else
-              results[index] = output
+          begin
+            loop do
+              break if exception
+              index = Thread.exclusive{ current_index += 1 }
+              break if index >= items.size
+
+              output = with_instrumentation items[index], index, options do
+                worker.work(index)
+              end
+
+              if ExceptionWrapper === output
+                exception = output.exception
+              else
+                results[index] = output
+              end
             end
+          ensure
+            worker.close_pipes
+            worker.wait # if it goes zombie, rather wait here to be able to debug
           end
-        ensure
-          worker.close_pipes
-          worker.wait # if it goes zombie, rather wait here to be able to debug
         end
       end
 
@@ -230,8 +231,6 @@ module Parallel
       Array.new(options[:count]).each do
         workers << worker(items, options.merge(:started_workers => workers), &block)
       end
-
-      kill_on_ctrl_c(workers.map(&:pid))
       workers
     end
 
@@ -302,19 +301,35 @@ module Parallel
       [count, options]
     end
 
-    # kill all these processes (children) if user presses Ctrl+c
-    def kill_on_ctrl_c(pids)
-      Signal.trap :SIGINT do
-        $stderr.puts 'Parallel execution interrupted, exiting ...'
-        pids.compact.each do |pid|
-          begin
-            Process.kill(:KILL, pid)
-          rescue Errno::ESRCH
-            # some linux systems already automatically killed the children at this point
-            # so we just ignore them not being there
+    # kill all these pids or threads if user presses Ctrl+c
+    def kill_on_ctrl_c(things)
+      if @to_be_killed
+        @to_be_killed << things
+      else
+        @to_be_killed = [things]
+        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) }
           end
+          exit 1 # Quit with 'failed' signal
+        end
+      end
+      yield
+    ensure
+      @to_be_killed.pop # free threads for GC and do not kill pids that could be used for new processes
+    end
+
+    def kill_that_thing!(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
-        exit 1 # Quit with 'failed' signal
       end
     end
 

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '0.6.5'
+  VERSION = Version = '0.7.0'
 end

data/spec/cases/parallel_fast_exit.rb

@@ -0,0 +1,7 @@
+require File.expand_path('spec/spec_helper')
+
+Parallel.map([1,2,3], :in_processes => 2) do
+  puts "I finished..."
+end
+
+sleep 10

data/spec/cases/parallel_start_and_kill.rb

@@ -1,6 +1,12 @@
 require File.expand_path('spec/spec_helper')
 
-Parallel.in_processes(2) do
+method = case ARGV[0]
+when "PROCESS" then :in_processes
+when "THREAD" then :in_threads
+else raise "Learn to use this!"
+end
+
+Parallel.send(method, 2) do
   sleep 10
   puts "I should have been killed earlier..."
-end
+end

data/spec/parallel_spec.rb

@@ -7,6 +7,13 @@ describe Parallel do
     Time.now.to_f - t
   end
 
+  def kill_process_with_name(file)
+    running_processes = `ps -f`.split("\n").map{ |line| line.split(/\s+/) }
+    pid_index = running_processes.detect { |p| p.include?("UID") }.index("UID") + 1
+    parent_pid = running_processes.detect { |p| p.include?(file) and not p.include?("sh") }[pid_index]
+    `kill -2 #{parent_pid}`
+  end
+
   describe ".processor_count" do
     it "returns a number" do
       (1..999).should include(Parallel.processor_count)
@@ -58,20 +65,39 @@ describe Parallel do
 
     it "kills the processes when the main process gets killed through ctrl+c" do
       time_taken{
-      lambda{
-        Thread.new do
-          `ruby spec/cases/parallel_start_and_kill.rb`
-        end
-        sleep 1
-        running_processes = `ps -f`.split("\n").map{ |line| line.split(/\s+/) }
-        pid_index = running_processes.detect{ |p| p.include?("UID") }.index("UID") + 1
-        parent_pid = running_processes.detect{ |p| p.include?("spec/cases/parallel_start_and_kill.rb") }[pid_index]
-        `kill -2 #{parent_pid}` #simulates Ctrl+c
-        sleep 1
-      }.should_not change{`ps`.split("\n").size}
+        lambda{
+          t = Thread.new { `ruby spec/cases/parallel_start_and_kill.rb PROCESS` }
+          sleep 1
+          kill_process_with_name("spec/cases/parallel_start_and_kill.rb") #simulates Ctrl+c
+          sleep 1
+          puts t.value
+        }.should_not change{`ps`.split("\n").size}
       }.should <= 3
     end
 
+    it "kills the threads when the main process gets killed through ctrl+c" do
+      time_taken{
+        lambda{
+          Thread.new { `ruby spec/cases/parallel_start_and_kill.rb THREAD` }
+          sleep 1
+          kill_process_with_name("spec/cases/parallel_start_and_kill.rb") #simulates Ctrl+c
+          sleep 1
+        }.should_not change{`ps`.split("\n").size}
+      }.should <= 3
+    end
+
+    it "does not kill anything on ctrl+c when everything has finished" do
+      time_taken do
+        t = Thread.new { `ruby spec/cases/parallel_fast_exit.rb 2>&1` }
+        sleep 2
+        kill_process_with_name("spec/cases/parallel_fast_exit.rb") #simulates Ctrl+c
+        sleep 1
+        result = t.value
+        result.scan(/I finished/).size.should == 3
+        result.should_not include("Parallel execution interrupted")
+      end.should <= 4
+    end
+
     it "saves time" do
       time_taken{
         `ruby spec/cases/parallel_sleeping_2.rb`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
   L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
   NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -69,6 +69,7 @@ files:
 - spec/cases/map_with_threads_and_break.rb
 - spec/cases/map_with_threads_and_exceptions.rb
 - spec/cases/no_dump_with_each.rb
+- spec/cases/parallel_fast_exit.rb
 - spec/cases/parallel_high_fork_rate.rb
 - spec/cases/parallel_influence_outside_data.rb
 - spec/cases/parallel_map.rb
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4198447693548042537
+      hash: 3171902731114170128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4198447693548042537
+      hash: 3171902731114170128
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25