forkify 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.2 / 2009-06-29
+
+* 2 bugfixes
+
+  * Forkify now works correctly returns array values on RedHat machines
+  * More tests!
+
 === 0.0.1 / 2009-06-23
 
 * 1 major enhancement

data/Manifest.txt

@@ -6,3 +6,4 @@ lib/forkify.rb
 test/test_forkify.rb
 examples/a.rb
 examples/b.rb
+examples/c.rb

data/README.txt

@@ -22,7 +22,7 @@
 
 == REQUIREMENTS:
 
-* None
+* Testy - only for running the tests
 
 == INSTALL:
 

data/Rakefile

@@ -4,12 +4,13 @@ require 'rubygems'
 require 'hoe'
 require './lib/forkify.rb'
 
-FORKIFY_VERSION = "0.0.1"
+FORKIFY_VERSION = "0.0.2"
 
-Hoe.spec('forkify') do |p|
-  p.version = FORKIFY_VERSION
-  p.rubyforge_name = 'hinmanm'
-  p.developer('Lee Hinman', 'lee@writequit.org')
+Hoe.spec('forkify') do
+  version = FORKIFY_VERSION
+  developer('Lee Hinman', 'lee@writequit.org')
+  rubyforge_name = 'hinmanm'
 end
 
+
 # vim: syntax=Ruby

data/examples/c.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# vim: set ts=2 sw=2 filetype=Ruby
+# 
+# This example shows a problem with the current implementation of forkify:
+# if a fork finishes work, it will still wait for the other forks to finish
+# in the process pool before forking new processes for work.
+#
+# I hope to remedy this as soon as I figure out a good solution for it.
+
+require 'forkify'
+
+[1, 1, 1, 1, 5, 1].forkify(5) { |n| puts n; sleep(n); n }
+
+# 0.04s user 0.06s system 1% cpu 6.031 total
+# (would be possible to run in a little over 5)

data/lib/forkify.rb

@@ -1,9 +1,27 @@
-#require 'pp'
+FORKIFY_DEBUG = false
+require 'pp' if FORKIFY_DEBUG
 
 module Enumerable
+
+  #
+  # Forkify will process _block_'s actions using processes. If no number of processes is
+  # given, the default of 5 will be used. If there are less than _procs_ number of items
+  # in the +Enumerable+ type, less processes will be spawned.
+  #
+  # It should be noted that forkify will *always* return an +Array+ at this time, so be
+  # careful with +Hash+ objects.
+  #
+  # = Examples
+  #
+  #    [1, 2, 3].forkify { |n| n*2 } => [2, 4, 6]
+  #
+  #    {:a => 1, :b => 2, :c => 3}.forkify { |k, v| [v, k] } => [[1, :a], [2, :b], [3, :c]]
+  #
+  #    10.times.forkify(10) { sleep(1) } => [1, 1, 1, 1, 1, 1, 1, 1, 1, 1] (runs for less than 2 seconds)
+  #
   def forkify procs = 5, &block
-    #puts "Class: #{self.class}"
-    if Array === self
+    puts "Forkify Class: #{self.class}" if FORKIFY_DEBUG
+    if self === Array
       items = self
     else
       begin
@@ -27,9 +45,9 @@ module Enumerable
       rpipes = []
 
       num_procs.times do |i|
-        #puts "Fork # #{i}"
+        puts "Fork # #{i}" if FORKIFY_DEBUG
         r, w = IO.pipe
-        #pp "r, w: #{r} #{w}"
+        pp "r, w: #{r} #{w}" if FORKIFY_DEBUG
         wpipes << w
         rpipes << r
         pid = fork
@@ -43,7 +61,7 @@ module Enumerable
             end
           w.write( Marshal.dump( result ))
           w.close
-          exit
+          exit!
         end
 
         pids << pid
@@ -52,19 +70,27 @@ module Enumerable
 
       offset += num_procs
 
-      #pp "Waiting for pids: #{pids}"
+      pp "Waiting for pids: #{pids.inspect}" if FORKIFY_DEBUG
       pids.each { |p| Process.waitpid(p) }
 
-      datawaiting_pipes = Kernel.select(rpipes, wpipes, nil, 2)
-      readwaiting_pipes = datawaiting_pipes[0]
-      writewaiting_pipes = datawaiting_pipes[1]
-      #pp "data: #{datawaiting_pipes}"
-      #pp "read: #{readwaiting_pipes}"
-      #pp "write: #{writewaiting_pipes}"
-      unless readwaiting_pipes.size != writewaiting_pipes.size
-        readwaiting_pipes.size.times do |i|
-          r = readwaiting_pipes[i]
-          w = writewaiting_pipes[i]
+      # 1 select version
+      #datawaiting_pipes = Kernel.select(rpipes, wpipes, nil, 2)
+      #readwaiting_pipes = datawaiting_pipes[0]
+      #writewaiting_pipes = datawaiting_pipes[1]
+      
+      # Switch to 2 selects instead of 1
+      #readwaiting_pipes = Kernel.select(rpipes, nil, nil, 2)[0]
+      #writewaiting_pipes = Kernel.select(nil, wpipes, nil, 2)[1]
+
+      # Finally settled on going through the pipes instead of select for Linux bug
+      unless rpipes.size != wpipes.size
+        rpipes.size.times do |i|
+          r = rpipes[i]
+          w = wpipes[i]
+
+          pp "read: #{readwaiting_pipes}" if FORKIFY_DEBUG
+          pp "write: #{writewaiting_pipes}" if FORKIFY_DEBUG
+
           w.close
           data = ''
           while ( buf = r.read(8192) )
@@ -72,6 +98,7 @@ module Enumerable
           end
           result = Marshal.load( data )
           r.close
+          pp "Pushing result: #{result}" if FORKIFY_DEBUG
           results << result
         end
       end

data/test/test_forkify.rb

@@ -1,18 +1,31 @@
-require "test/unit"
+require "testy"
 require "forkify"
 
-class TestForkify < Test::Unit::TestCase
-  def test_timings
+Testy.testing 'forkify' do
+  test 'timings' do |t|
     time1 = Time.now
     r = [1, 2, 3].forkify(3) { |n| sleep(1) }
     time2 = Time.now
     # Assert that it took less than 3 seconds
-    assert (time2 - time1) < 3
+    less_than_3 = ((time2 - time1) < 3)
+    t.check :timing, :expect => true, :actual => less_than_3
   end
 
-  def test_array_results_returned_correctly
+  test 'array results' do |t|
     r = [1, 2, 3].forkify { |n| n * 2 }
-    assert r == [2, 4, 6]
+    t.check :array_results, :expect => [2, 4, 6], :actual => r
   end
 
+  test 'hash results' do |t|
+    r = {:a => 1, :b => 2, :c => 3}.forkify { |k, v| [k, v*2] }
+    t.check :hash_contains_a, :expect => true, :actual => r.include?([:a, 2])
+    t.check :hash_contains_b, :expect => true, :actual => r.include?([:b, 4])
+    t.check :hash_contains_c, :expect => true, :actual => r.include?([:c, 6])
+    t.check :hash_length, :expect => 3, :actual => r.size
+  end
+
+  test 'array of nils' do |t|
+    r = [nil, nil].forkify { |n| n }
+    t.check :nil_array, :expect => [nil, nil], :actual => r
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: forkify
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lee Hinman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -06:00
+date: 2009-06-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.3.1
     version: 
 description: |-
   forkify.rb makes it easy to process a bunch of data using 'n'
@@ -45,6 +45,7 @@ files:
 - test/test_forkify.rb
 - examples/a.rb
 - examples/b.rb
+- examples/c.rb
 has_rdoc: true
 homepage: http://github.com/dakrone/forkify
 licenses: []
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: hinmanm
+rubyforge_project: forkify
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3