forkandreturn 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.2.1 (06-10-2008)
+
+* Fixed a bug concerning single-core machines.
+
+* Introduced ThreadLimiter.handle_clusters.
+
 0.2.0 (27-07-2008)
 
 * Removed Enumerable#concurrent() and

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/forkandreturn/enumerable.rb

@@ -23,7 +23,7 @@ module Enumerable
   # concurrent_collect() is suitable for handling a couple of very CPU intensive jobs, like parsing large XML files.
 
   def concurrent_collect(max_concurrent_workers=-1, &block)
-    max_concurrent_workers	= 0	unless ForkAndReturn::Util.multi_core? and ForkAndReturn::Util.forkable?
+    max_concurrent_workers	= 0	unless ForkAndReturn::Util.forkable?
 
     case
     when max_concurrent_workers < 0	# No limit.
@@ -69,34 +69,12 @@ module Enumerable
   # clustered_concurrent_collect() is suitable for handling a lot of not too CPU intensive jobs.
 
   def clustered_concurrent_collect(number_of_clusters=ForkAndReturn::Util.cores, &block)
-    number_of_clusters	= 0	unless ForkAndReturn::Util.multi_core? and ForkAndReturn::Util.forkable?
+    number_of_clusters	= 0	unless ForkAndReturn::Util.forkable?
 
     if number_of_clusters < 1
       self.concurrent_collect(number_of_clusters, &block)
     else
-      clusters	= []	# One cluster per fork.
-      last_pos	= -1
-      res	= []
-
-      self.each do |object|
-        last_pos += 1
-
-        (clusters[last_pos%number_of_clusters] ||= []) << object
-      end
-
-      clusters.concurrent_collect(-1) do |cluster|
-        cluster.collect do |object|
-          if block.arity > 1 and object.kind_of?(Enumerable)
-            yield(*object.to_a)
-          else
-            yield(object)
-          end
-        end + (cluster.length == clusters[0].length ? [] : [nil])	# Add padding nil, in order to be able to transpose
-      end.transpose.each do |array|
-        res.concat(array)
-      end
-
-      res[0..last_pos]	# Remove padding nil.
+      ThreadLimiter.handle_clusters(self, number_of_clusters, :concurrent_collect, &block)
     end
   end
 

data/test/test.rb

@@ -232,7 +232,6 @@ class ForkAndReturnEnumerableTest < Test::Unit::TestCase
     result	= data.collect(&block)
 
     assert_equal(3, data.clustered_concurrent_collect(3, &block).sort.uniq.length)
-
     assert_equal(result, data.clustered_concurrent_collect(0, &block))
     assert_not_equal(result, data.clustered_concurrent_collect(3, &block))
     assert_not_equal(result, data.clustered_concurrent_collect(-1, &block))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: forkandreturn
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Erik Veenstra
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-27 00:00:00 +02:00
+date: 2008-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.2
     version: 
 description: Runs a block of code in a seperate process and collects the result later. Includes a lot of convenient methods on Enumerable.
 email: forkandreturn@erikveen.dds.nl
@@ -52,7 +52,7 @@ rdoc_options:
 - CHANGELOG
 - example.txt
 - --title
-- forkandreturn (0.2.0)
+- forkandreturn (0.2.1)
 - --main
 - README
 require_paths: