parallel 0.5.14 → 0.5.15

data/Readme.md

@@ -63,6 +63,7 @@ Authors
  - [brian p o'rourke](https://github.com/bpo)
  - [Norio Sato]
  - [Neal Stewart](https://github.com/n-time)
+ - [Jurriaan Pruis](http://github.com/jurriaan)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.5.14
+0.5.15

data/lib/parallel.rb

@@ -1,5 +1,4 @@
 require 'thread' # to get Thread.exclusive
-require 'base64'
 require 'rbconfig'
 
 class Parallel
@@ -157,8 +156,8 @@ class Parallel
           index = Thread.exclusive{ current_index += 1 }
           break if index >= items.size
 
-          write_to_pipe(worker[:write], index)
-          output = decode(worker[:read].gets.chomp)
+          Marshal.dump(index, worker[:write])
+          output = Marshal.load(worker[:read])
 
           if ExceptionWrapper === output
             exception = output.exception
@@ -221,22 +220,18 @@ class Parallel
   end
 
   def self.process_incoming_jobs(read, write, items, options, &block)
-    while input = read.gets and input != "\n"
-      index = decode(input.chomp)
+    while !read.eof?
+      index = Marshal.load(read)
       begin
         result = call_with_index(items, index, options, &block)
         result = nil if options[:preserve_results] == false
       rescue Exception => e
         result = ExceptionWrapper.new(e)
       end
-      write_to_pipe(write, result)
+      Marshal.dump(result, write)
     end
   end
 
-  def self.write_to_pipe(pipe, item)
-    pipe.write(encode(item))
-  end
-
   def self.wait_for_threads(threads)
     threads.compact.each do |t|
       begin
@@ -255,14 +250,6 @@ class Parallel
     end
   end
 
-  def self.encode(obj)
-    Base64.encode64(Marshal.dump(obj)).split("\n").join + "\n"
-  end
-
-  def self.decode(str)
-    Marshal.load(Base64.decode64(str))
-  end
-
   # options is either a Integer or a Hash with :count
   def self.extract_count_from_options(options)
     if options.is_a?(Hash)
@@ -292,7 +279,7 @@ class Parallel
   class ExceptionWrapper
     attr_reader :exception
     def initialize(exception)
-      dumpable = Parallel.encode(exception) rescue nil
+      dumpable = Marshal.dump(exception) rescue nil
       unless dumpable
         exception = RuntimeError.new("Undumpable Exception -- #{exception.inspect}")
       end

data/parallel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallel"
-  s.version = "0.5.14"
+  s.version = "0.5.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-02-07"
+  s.date = "2012-02-24"
   s.email = "grosser.michael@gmail.com"
   s.files = [
     "Gemfile",
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/cases/parallel_high_fork_rate.rb",
      "spec/cases/parallel_influence_outside_data.rb",
      "spec/cases/parallel_map.rb",
+     "spec/cases/parallel_map_complex_objects.rb",
      "spec/cases/parallel_map_range.rb",
      "spec/cases/parallel_map_sleeping.rb",
      "spec/cases/parallel_map_uneven.rb",
@@ -53,32 +54,33 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.15"
   s.summary = "Run any kind of code in parallel processes"
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/parallel_spec.rb",
-     "spec/cases/map_with_index_empty.rb",
-     "spec/cases/parallel_map_range.rb",
-     "spec/cases/map_with_threads_and_exceptions.rb",
+    "spec/cases/host_os_override_processor_count.rb",
+     "spec/cases/parallel_raise_undumpable.rb",
+     "spec/cases/parallel_map_complex_objects.rb",
      "spec/cases/parallel_influence_outside_data.rb",
-     "spec/cases/count_open_pipes.rb",
-     "spec/cases/parallel_with_set_processes.rb",
-     "spec/cases/parallel_with_detected_cpus.rb",
      "spec/cases/parallel_start_and_kill.rb",
-     "spec/cases/parallel_raise_undumpable.rb",
-     "spec/cases/parallel_sleeping_2.rb",
-     "spec/cases/host_os_override_processor_count.rb",
      "spec/cases/map_with_index.rb",
+     "spec/cases/each.rb",
      "spec/cases/map_with_nested_arrays_and_nil.rb",
-     "spec/cases/parallel_map_uneven.rb",
-     "spec/cases/parallel_map_sleeping.rb",
-     "spec/cases/each_with_index.rb",
      "spec/cases/map_with_processes_and_exceptions.rb",
-     "spec/cases/no_dump_with_each.rb",
+     "spec/cases/parallel_map_sleeping.rb",
      "spec/cases/parallel_raise.rb",
+     "spec/cases/parallel_map_range.rb",
+     "spec/cases/each_with_index.rb",
+     "spec/cases/map_with_threads_and_exceptions.rb",
+     "spec/cases/parallel_sleeping_2.rb",
+     "spec/cases/parallel_map_uneven.rb",
      "spec/cases/parallel_high_fork_rate.rb",
-     "spec/cases/parallel_map.rb",
-     "spec/cases/each.rb",
+     "spec/cases/parallel_with_set_processes.rb",
      "spec/cases/closes_processes_at_runtime.rb",
-     "spec/cases/parallel_with_nil_uses_detected_cpus.rb"
+     "spec/cases/parallel_with_detected_cpus.rb",
+     "spec/cases/map_with_index_empty.rb",
+     "spec/cases/parallel_with_nil_uses_detected_cpus.rb",
+     "spec/cases/parallel_map.rb",
+     "spec/cases/no_dump_with_each.rb",
+     "spec/cases/count_open_pipes.rb",
+     "spec/parallel_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/cases/parallel_map_complex_objects.rb

@@ -0,0 +1,8 @@
+require File.expand_path('spec/spec_helper')
+
+object = ["\nasd#{File.read('Gemfile')}--#{File.read('Rakefile')}"*100, 12345, {:b=>:a}]
+
+result = Parallel.map([1,2]) do |x|
+  object
+end
+print 'YES' if result.inspect == [object, object].inspect

data/spec/parallel_spec.rb

@@ -131,6 +131,10 @@ describe Parallel do
       `ruby spec/cases/parallel_map.rb`.should == "-a- -b- -c- -d-"
     end
 
+    it "can dump/load complex objects" do
+      `ruby spec/cases/parallel_map_complex_objects.rb`.should == "YES"
+    end
+
     it "starts new process imediatly when old exists" do
       time_taken{
       `ruby spec/cases/parallel_map_uneven.rb`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 5
-  - 14
-  version: 0.5.14
+  - 15
+  version: 0.5.15
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-24 00:00:00 Z
 dependencies: []
 
 description: 
@@ -48,6 +48,7 @@ files:
 - spec/cases/parallel_high_fork_rate.rb
 - spec/cases/parallel_influence_outside_data.rb
 - spec/cases/parallel_map.rb
+- spec/cases/parallel_map_complex_objects.rb
 - spec/cases/parallel_map_range.rb
 - spec/cases/parallel_map_sleeping.rb
 - spec/cases/parallel_map_uneven.rb
@@ -94,29 +95,30 @@ signing_key:
 specification_version: 3
 summary: Run any kind of code in parallel processes
 test_files: 
-- spec/spec_helper.rb
-- spec/parallel_spec.rb
-- spec/cases/map_with_index_empty.rb
-- spec/cases/parallel_map_range.rb
-- spec/cases/map_with_threads_and_exceptions.rb
+- spec/cases/host_os_override_processor_count.rb
+- spec/cases/parallel_raise_undumpable.rb
+- spec/cases/parallel_map_complex_objects.rb
 - spec/cases/parallel_influence_outside_data.rb
-- spec/cases/count_open_pipes.rb
-- spec/cases/parallel_with_set_processes.rb
-- spec/cases/parallel_with_detected_cpus.rb
 - spec/cases/parallel_start_and_kill.rb
-- spec/cases/parallel_raise_undumpable.rb
-- spec/cases/parallel_sleeping_2.rb
-- spec/cases/host_os_override_processor_count.rb
 - spec/cases/map_with_index.rb
+- spec/cases/each.rb
 - spec/cases/map_with_nested_arrays_and_nil.rb
-- spec/cases/parallel_map_uneven.rb
-- spec/cases/parallel_map_sleeping.rb
-- spec/cases/each_with_index.rb
 - spec/cases/map_with_processes_and_exceptions.rb
-- spec/cases/no_dump_with_each.rb
+- spec/cases/parallel_map_sleeping.rb
 - spec/cases/parallel_raise.rb
+- spec/cases/parallel_map_range.rb
+- spec/cases/each_with_index.rb
+- spec/cases/map_with_threads_and_exceptions.rb
+- spec/cases/parallel_sleeping_2.rb
+- spec/cases/parallel_map_uneven.rb
 - spec/cases/parallel_high_fork_rate.rb
-- spec/cases/parallel_map.rb
-- spec/cases/each.rb
+- spec/cases/parallel_with_set_processes.rb
 - spec/cases/closes_processes_at_runtime.rb
+- spec/cases/parallel_with_detected_cpus.rb
+- spec/cases/map_with_index_empty.rb
 - spec/cases/parallel_with_nil_uses_detected_cpus.rb
+- spec/cases/parallel_map.rb
+- spec/cases/no_dump_with_each.rb
+- spec/cases/count_open_pipes.rb
+- spec/parallel_spec.rb
+- spec/spec_helper.rb