parallel 0.5.7 → 0.5.8

data/Gemfile.lock

@@ -10,16 +10,14 @@ GEM
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
 

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/parallel.rb

@@ -122,56 +122,45 @@ class Parallel
   end
 
   def self.work_in_processes(items, options, &blk)
-    workers = Array.new(options[:count]).map{ worker(items, options, &blk) }
-    Parallel.kill_on_ctrl_c(workers.map{|worker| worker[:pid] })
-
     current_index = -1
+    results = []
+    pids = []
+    exception = nil
 
-    # give every worker something to do
-    workers.each do |worker|
-      write_to_pipe(worker[:write], current_index += 1)
-    end
+    Parallel.kill_on_ctrl_c(pids)
 
-    # fetch results and hand out new work
-    listener_threads = []
-    result = Array.new(items.size)
-    exception = nil
+    in_threads(options[:count]) do |i|
+      x = i
+      worker = worker(items, options, &blk)
+      pids[i] = worker[:pid]
 
-    workers.each do |worker|
-      listener_threads << Thread.new do
-        begin
-          while output = worker[:read].gets
-            # store output from worker
-            result_index, output = decode(output.chomp)
-            if ExceptionWrapper === output
-              exception = output.exception
-              break
-            elsif exception # some other thread failed
-              break
-            end
-
-            result[result_index] = output
-
-            # give worker next item
-            next_index = Thread.exclusive{ current_index += 1 }
-            break if next_index >= items.size
-            write_to_pipe(worker[:write], next_index)
+      begin
+        loop do
+          break if exception
+          index = Thread.exclusive{ current_index += 1 }
+          break if index >= items.size
+
+          write_to_pipe(worker[:write], index)
+          output = decode(worker[:read].gets.chomp)
+
+          if ExceptionWrapper === output
+            exception = output.exception
+          else
+            results[index] = output
           end
-        ensure
-          worker[:read].close
-          worker[:write].close
         end
+      ensure
+        worker[:read].close
+        worker[:write].close
+
+        # if it goes zombie, rather wait here to be able to debug
+        wait_for_process worker[:pid]
       end
     end
 
-    wait_for_threads(listener_threads)
-
-    # if they go zombie, rather wait here to be able to debug
-    wait_for_processes(workers.map{|worker| worker[:pid] })
-
     raise exception if exception
 
-    result
+    results
   end
 
   def self.worker(items, options, &block)
@@ -208,7 +197,7 @@ class Parallel
       rescue Exception => e
         result = ExceptionWrapper.new(e)
       end
-      write_to_pipe(write, [index, result])
+      write_to_pipe(write, result)
     end
   end
 
@@ -226,13 +215,11 @@ class Parallel
     end
   end
 
-  def self.wait_for_processes(pids)
-    pids.each do |pid|
-      begin
-        Process.wait(pid)
-      rescue Interrupt
-        # process died
-      end
+  def self.wait_for_process(pid)
+    begin
+      Process.wait(pid)
+    rescue Interrupt
+      # process died
     end
   end
 
@@ -259,7 +246,7 @@ class Parallel
   def self.kill_on_ctrl_c(pids)
     Signal.trap :SIGINT do
       $stderr.puts 'Parallel execution interrupted, exiting ...'
-      pids.each { |pid| Process.kill(:KILL, pid) }
+      pids.each { |pid| Process.kill(:KILL, pid) if pid }
       exit 1 # Quit with 'failed' signal
     end
   end

data/parallel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-18}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",

data/spec/cases/map_with_processes_and_exceptions.rb

@@ -1,16 +1,13 @@
 require File.expand_path('spec/spec_helper')
 
-class Parallel
-  def self.wait_for_threads(threads)
-    print ' all joined'
-  end
-end
-
 begin
   Parallel.map(1..100, :in_processes => 4) do |x|
+    sleep 0.1 # so all processes get started
     print x
     raise 'foo' if x == 1
+    sleep 0.1 # so no now work gets queued before exception is raised
+    x
   end
 rescue
   print ' raised'
-end
+end

data/spec/cases/map_with_threads_and_exceptions.rb

@@ -1,16 +1,12 @@
 require File.expand_path('spec/spec_helper')
 
-class Parallel
-  def self.wait_for_threads(threads)
-    print ' all joined'
-  end
-end
-
 begin
   Parallel.map(1..100, :in_threads => 4) do |x|
+    sleep 0.1 # so all processes get started
     print x
     raise 'foo' if x == 1
+    sleep 0.1 # so no now work gets queued before exception is raised
   end
 rescue
   print ' raised'
-end
+end

data/spec/parallel_spec.rb

@@ -1,6 +1,11 @@
 require File.expand_path('spec/spec_helper')
 
 describe Parallel do
+  def time_taken
+    t = Time.now.to_f
+    yield
+    Time.now.to_f - t
+  end
 
   describe :processor_count do
     it "returns a number" do
@@ -37,25 +42,25 @@ describe Parallel do
     end
 
     it "kills the processes when the main process gets killed through ctrl+c" do
-      t = Time.now
+      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{ |line| line.include?("UID") }.index("UID") + 1
-        parent_pid = running_processes.detect{ |line| line.grep(/(0|)0:00(:|.)00/).any? and line.include?("ruby") }[pid_index]
+        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}
-      Time.now.should be_close(t, 3)
+      }.should <= 3
     end
 
     it "saves time" do
-      t = Time.now
-      `ruby spec/cases/parallel_sleeping_2.rb`
-      Time.now.should be_close(t, 3)
+      time_taken{
+        `ruby spec/cases/parallel_sleeping_2.rb`
+      }.should < 3.5
     end
 
     it "raises when one of the processes raises" do
@@ -73,9 +78,9 @@ describe Parallel do
 
   describe :in_threads do
     it "saves time" do
-      t = Time.now
-      Parallel.in_threads(3){ sleep 2 }
-      Time.now.should be_close(t, 3)
+      time_taken{
+        Parallel.in_threads(3){ sleep 2 }
+      }.should < 3
     end
 
     it "does not create new processes" do
@@ -93,9 +98,9 @@ describe Parallel do
 
   describe :map do
     it "saves time" do
-      t = Time.now
+      time_taken{
       `ruby spec/cases/parallel_map_sleeping.rb`
-      Time.now.should be_close(t, 3)
+      }.should <= 3.5
     end
 
     it "executes with given parameters" do
@@ -103,9 +108,9 @@ describe Parallel do
     end
 
     it "starts new process imediatly when old exists" do
-      t = Time.now
+      time_taken{
       `ruby spec/cases/parallel_map_uneven.rb`
-      Time.now.should be_close(t, 3)
+      }.should <= 3.5
     end
 
     it "does not flatten results" do
@@ -124,12 +129,12 @@ describe Parallel do
       `ruby spec/cases/map_with_nested_arrays_and_nil.rb`.should == '[nil, [2, 2], [[3], [3]]]'
     end
 
-    it 'joins all workers, when one fails in process' do
-      `ruby spec/cases/map_with_processes_and_exceptions.rb 2>&1`.should =~ /^\d{4} all joined raised$/
+    it 'stops all workers when one fails in process' do
+      `ruby spec/cases/map_with_processes_and_exceptions.rb 2>&1`.should =~ /^\d{4} raised$/
     end
 
-    it 'joins all workers, when one fails in thread' do
-      `ruby spec/cases/map_with_threads_and_exceptions.rb 2>&1`.should =~ /^\d{0,4} all joined raised$/
+    it 'stops all workers when one fails in thread' do
+      `ruby spec/cases/map_with_threads_and_exceptions.rb 2>&1`.should =~ /^\d{0,4} raised$/
     end
 
     it "can run with 0 threads" do
@@ -154,12 +159,12 @@ describe Parallel do
 
     it "can run with 0 threads" do
       Thread.should_not_receive(:exclusive)
-      Parallel.map_with_index([1,2,3,4,5,6,7,8,9], :in_threads => 0){|x| x+2 }.should == [3,4,5,6,7,8,9,10,11]
+      Parallel.map_with_index([1,2,3,4,5,6,7,8,9], :in_threads => 0){|x,i| x+2 }.should == [3,4,5,6,7,8,9,10,11]
     end
 
     it "can run with 0 processes" do
       Process.should_not_receive(:fork)
-      Parallel.map_with_index([1,2,3,4,5,6,7,8,9], :in_processes => 0){|x| x+2 }.should == [3,4,5,6,7,8,9,10,11]
+      Parallel.map_with_index([1,2,3,4,5,6,7,8,9], :in_processes => 0){|x,i| x+2 }.should == [3,4,5,6,7,8,9,10,11]
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +02:00
+date: 2011-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: []