parallel 0.5.6 → 0.5.7

data/Readme.md

@@ -40,6 +40,7 @@ Processes/Threads are workers, they grab the next piece of work when they finish
 Tips
 ====
  - [ActiveRecord] `ActiveRecord::Base.connection.reconnect!` inside the parallel block prevents errors
+ - [Benchmark/Test] Disable threading/forking with `:in_threads => 0` or `:in_processes => 0`, great to test performance or to debug parallel issues
 
 TODO
 ====

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/parallel.rb

@@ -49,6 +49,8 @@ class Parallel
     end
     size = [array.size, size].min
 
+    return work_direct(array, options, &block) if size == 0
+
     if method == :in_threads
       work_in_threads(array, options.merge(:count => size), &block)
     else
@@ -67,7 +69,7 @@ class Parallel
     when /darwin/
       (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.ncpu`).to_i
     when /linux/
-      `cat /proc/cpuinfo | grep processor | wc -l`.to_i
+      `grep -c processor /proc/cpuinfo`.to_i
     when /freebsd/
       `sysctl -n hw.ncpu`.to_i
     when /mswin|mingw/
@@ -80,6 +82,14 @@ class Parallel
 
   private
 
+  def self.work_direct(array, options)
+    results = []
+    array.each_with_index do |e,i|
+      results << (options[:with_index] ? yield(e,i) : yield(e))
+    end
+    results
+  end
+
   def self.hwprefs_available?
     `which hwprefs` != ''
   end

data/parallel.gemspec

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

data/spec/parallel_spec.rb

@@ -131,6 +131,16 @@ describe Parallel do
     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$/
     end
+
+    it "can run with 0 threads" do
+      Thread.should_not_receive(:exclusive)
+      Parallel.map([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]
+    end
+
+    it "can run with 0 processes" do
+      Process.should_not_receive(:fork)
+      Parallel.map([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]
+    end
   end
 
   describe :map_with_index do
@@ -141,6 +151,16 @@ describe Parallel do
     it "does not crash with empty set" do
       `ruby spec/cases/map_with_index_empty.rb 2>&1`.should == ''
     end
+
+    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]
+    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]
+    end
   end
 
   describe :each do

metadata

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