parallelize 0.3.0 → 0.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+=== 0.4.0 / 2012/06/19
+* Added interrupt handling
+
 === 0.3.0 / 2012/06/10
 * Added `pmap`
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/parallelize/enumerable_ext.rb

@@ -5,40 +5,62 @@ module Enumerable
       raise ArgumentError.new("Invalid number of threads") if num_threads < 1
 
       threads = []
-      enum.each_slice((enum.count{true} / num_threads.to_f).ceil) do |slice|
-        threads << 
-          case block.arity
-          when 2
-            Thread.new(slice, threads.length) { |my_slice, thread_idx|
-              my_slice.send(method) { |e| yield e, thread_idx }
-            }
-          when 1
-            Thread.new(slice) { |my_slice|
-              my_slice.send(method) { |e| yield e }
-            }
-          when 0, -1
-            raise ArgumentError.new("Invalid arity: #{block.arity}") if
-              RUBY_VERSION !~ /^1.8\./ && block.arity == -1
-            Thread.new(slice) { |my_slice|
-              my_slice.send(method) { yield }
-            }
-          else
-            raise ArgumentError.new("Invalid arity: #{block.arity}")
+
+      reap = lambda do |tidx|
+        threads[tidx..-1].each do |t|
+          t.raise Interrupt if t.alive?
+          begin
+            t.join
+          rescue Exception
+            nil
           end
+        end
       end
 
-      exceptions = {}
-      threads.each_with_index do |thr, idx|
-        begin
-          thr.join
-        rescue Exception => e
-          if collect_exceptions
-            exceptions[idx] = e
-            nil
-          else
-            raise e
+      begin
+        prev_trap = trap('INT') { Thread.current.raise Interrupt }
+        enum.each_slice((enum.count{true} / num_threads.to_f).ceil) do |slice|
+          threads << 
+            case block.arity
+            when 2
+              Thread.new(slice, threads.length) { |my_slice, thread_idx|
+                my_slice.send(method) { |e| yield e, thread_idx }
+              }
+            when 1
+              Thread.new(slice) { |my_slice|
+                my_slice.send(method) { |e| yield e }
+              }
+            when 0, -1
+              raise ArgumentError.new("Invalid arity: #{block.arity}") if
+                RUBY_VERSION !~ /^1.8\./ && block.arity == -1
+              Thread.new(slice) { |my_slice|
+                my_slice.send(method) { yield }
+              }
+            else
+              raise ArgumentError.new("Invalid arity: #{block.arity}")
+            end
+        end
+
+        exceptions = {}
+        threads.each_with_index do |thr, idx|
+          begin
+            thr.join
+          rescue Exception => e
+            if collect_exceptions
+              exceptions[idx] = e
+              nil
+            else
+              reap.call idx + 1
+              raise e
+            end
           end
         end
+      rescue Interrupt
+        # Interrupts threads
+        reap.call 0
+        raise
+      ensure
+        trap('INT', prev_trap) if prev_trap
       end
 
       unless exceptions.empty?

data/test/test_parallelize.rb

@@ -137,4 +137,54 @@ class TestParallelize < Test::Unit::TestCase
       (0..100).pmap(thr) { |e, tidx| "#{e} by #{tidx}" }
     )
   end
+
+  def test_reap
+    ic = 0
+    t = Thread.new {
+      begin
+        parallelize(2) do |idx|
+          begin
+            raise Exception.new if idx == 0
+            loop {}
+          rescue Interrupt
+            puts "Interrupted (#{idx}-#{ic})"
+            ic += 1
+          end
+        end
+      rescue Interrupt
+        puts "Interrupted (parallelize-#{ic})"
+        ic += 1
+      rescue Exception
+        puts "Exception thrown from a child"
+        raise
+      end
+    }
+
+    assert_raise(Exception) { t.join }
+    assert_equal 1, ic
+  end
+
+  def test_interrupt
+    ic = 0
+    t = Thread.new {
+      begin
+        parallelize(2) do |idx|
+          begin
+            loop {}
+          rescue Interrupt
+            puts "Interrupted (#{idx}-#{ic})"
+            ic += 1
+          end
+        end
+      rescue Interrupt
+        puts "Interrupted (parallelize-#{ic})"
+        ic += 1
+      end
+    }
+
+    sleep 2
+    t.raise Interrupt
+    t.join
+    assert_equal 3, ic
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallelize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4037532998974082938
+      hash: -3400073306691178831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: