abundance 1.3.4 → 1.3.5

data/lib/abundance.rb

@@ -37,11 +37,13 @@
 # Copyright:: 2008 Louis-Philippe Perron - Released under the terms of the MIT license
 # 
 # :title:Abundance
+require 'globalog'
+$log_abundance = GlobaLog.logger(STDERR,:warn)
 
 class Abundance
-  require 'garden'
-  require 'gardener'
-  require 'seed'
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'garden')
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'gardener')
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'seed')
   
   # The +gardener+ class method initializes a gardener instance
   # with its garden supplied as a block.  The invocation block must include
@@ -79,15 +81,18 @@ class Abundance
   #  gardener.close
   
   def Abundance.gardener(options={:wheelbarrow => 8192, :rows => 2, :init_timeout => 2},&gardener_block)
-    return Gardener.new(options,gardener_block)
+		$log_abundance.debug("Abundance.gardener") {"options: #{options.inspect}"}
+		return Gardener.new(options,gardener_block)
   end
   
   # The +grow+ class method needs to be used inside the gardener invocation.
   # A seed instance is given each time, acting as getter/setter for your queued seed commands
   
   def Abundance.grow(&grow_block)
-    loop do
+    until nil
+			$log_abundance.debug("Abundance.grow") {"enter loop"}
       unless $seed.nil? || $seed.include?(:message)
+				$log_abundance.debug("Abundance.grow") {"call grow block for seed: #{$seed.inspect}"}
         grow_block.call(Seed.new)
       end
       Thread.stop
@@ -102,6 +107,7 @@ class Abundance
   # === Example
   #   Abundance.init_status(true,'Initialisation Successfull!!!')
   def Abundance.init_status(success,message)
+		$log_abundance.debug("Abundance.init_status") { "success: #{success.inspect} message: #{message.inspect}"}
     $init = {:id => Process.pid, :seed => 'init_status', :success => success, :message => message}
   end
   

data/lib/garden.rb

@@ -15,10 +15,10 @@
 # :title:Garden
 
 class Garden
-  require 'rows'
-  require 'garden_cycles'
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'rows')
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'garden_cycles')
   include Cycles
-  require 'toolshed'
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'toolshed')
   include Toolshed
   
   attr_reader :pid
@@ -37,10 +37,10 @@ class Garden
       set_my_containers
       set_my_socket_as_a(:garden)
       
-      loop do
+      until nil
 				route_message_blocks
 				seed_available_rows
-				
+				$log_abundance.debug('garden') {"select reader: #{@reader[:sockets].inspect} writer: #{@writer[:sockets]}"}
         ready = select(@reader[:sockets],@writer[:sockets],nil,10)
         unless ready.nil?
           readable, writable = ready[0..1]

data/lib/garden_cycles.rb

@@ -15,6 +15,7 @@ class Garden
     end
     
     def sprout_readable(readable)
+			$log_abundance.debug('Garden::Cycles') {"sprout_readable"}
       readable.each do |i_socket|
         if i_socket == @my_socket
           add_readable(i_socket)
@@ -25,6 +26,7 @@ class Garden
     end
     
     def crop_writable(writable)
+			$log_abundance.debug('Garden::Cycles') {"crop_writable"}
       writable.each do |o_socket|
         if @writer[:buffer][o_socket.to_s] == '' || @writer[:buffer][o_socket.to_s] == nil
           remove_writable(o_socket)
@@ -35,6 +37,7 @@ class Garden
     end
     
     def route_message_blocks
+			$log_abundance.debug('Garden::Cycles') {"route_message_blocks"}
       until @message_block_queue.empty?
         message_block = @message_block_queue.shift
 
@@ -60,12 +63,15 @@ class Garden
     end
 
 		def seed_available_rows
+				$log_abundance.debug('Garden::Cycles') {"seed_available_rows"}
         catch :fill_rows do
-          loop do
+					looped = 0
+          while (looped+=1) < 9
 						throw :fill_rows if @waiting_rows.empty?
-						
+						$log_abundance.debug('Garden::Cycles') {"seed_available_rows: waiting_rows: #{@waiting_rows.inspect}"}
             if @seed_all_message_block && @seed_all_message_block[4][:row_done].size != @seed_all_message_block[1]
-              row_socket_path = @waiting_rows.shift
+              $log_abundance.debug('Garden::Cycles') {"seed_available_rows: all_message_block #{@seed_all_message_block.inspect}"}
+							row_socket_path = @waiting_rows.shift
               unless @seed_all_message_block[4][:row_done].include?( row_socket_path )
                 add_writable([:seed,:all,@seed_all_message_block[2],row_socket_path])
                 @seed_all_message_block[4][:row_done] << row_socket_path
@@ -74,7 +80,8 @@ class Garden
               end
 
             elsif @init_message_block && @init_message_block[4][:row_done].size != @init_message_block[2]
-              row_socket_path = @waiting_rows.shift
+              $log_abundance.debug('Garden::Cycles') {"seed_available_rows: init_message_block #{@init_message_block.inspect}"}
+							row_socket_path = @waiting_rows.shift
               unless @init_message_block[4][:row_done].include?( row_socket_path )
                 add_writable([:seed,:init,'init_status',row_socket_path])
                 @init_message_block[4][:row_done] << row_socket_path
@@ -83,13 +90,16 @@ class Garden
               end
 
             elsif ! @seeds.empty?
+							$log_abundance.debug('Garden::Cycles') {"seed_available_rows: ! seeds.empty? #{@seeds.inspect}"}
               seed = @seeds.shift; @sprouts[seed[:id]] = seed
               add_writable([:seed,:sprout,seed,@waiting_rows.shift])
 
             elsif @close_message_block && ! @waiting_rows.empty?
+							$log_abundance.debug('Garden::Cycles') {"seed_available_rows: close_message_block: #{@close_message_block.inspect}"}
               add_writable([:seed,:quit,nil,@waiting_rows.shift])
 
             else
+							$log_abundance.debug('Garden::Cycles') {"seed_available_rows: else"}
               throw :fill_rows
 						end
 						               

data/lib/gardener.rb

@@ -16,7 +16,7 @@
 # :title:Gardener
 
 class Gardener
-  require 'toolshed'
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'toolshed')
   include Toolshed
   
   # The +new+ class method initializes the class.

data/lib/rows.rb

@@ -20,9 +20,9 @@ class Garden
   # :title:Rows
   
   class Rows
-    require 'rows_paths'
+		require File.join( File.dirname( File.expand_path(__FILE__)), 'rows_paths')
     include Paths
-    require 'toolshed'
+		require File.join( File.dirname( File.expand_path(__FILE__)), 'toolshed')
     include Toolshed
     attr_reader :pids
     
@@ -45,41 +45,44 @@ class Garden
       rows.times do
         @pids << fork do
           set_my_socket_as_a(:row,garden_pid)
-          t1 = Thread.new do
-            gardener_block.call
-          end
 
           t2 = Thread.new do
-            loop do
-              if $seed.nil?
-                message_block = socket_duplex([:row,:row,@my_socket_path,@garden_path])
-                case message_block[1]
-                when :sprout
-                  sprout(message_block)
-                when :all
-                  all(message_block)
-                when :wait
-                  message_block = socket_recv
-                  case message_block[1]
-                  when :sprout
-                    sprout(message_block)
-                  when :all
-                    all(message_block)
-                  when :init
-                    init
-                  when :quit
-                    quit
-                  end
-                when :init
-                  init
-                when :quit
-                  quit
-                end
-              elsif ! $seed[:success].nil?
-                crop
-              else
-                t1.run
-              end
+						t1 = Thread.new do
+	            gardener_block.call
+	          end
+						
+						until nil
+              if t1.stop?
+								if $seed.nil?
+	                message_block = socket_duplex([:row,:row,@my_socket_path,@garden_path])
+	                case message_block[1]
+	                when :sprout
+	                  sprout(message_block)
+	                when :all
+	                  all(message_block)
+	                when :wait
+	                  message_block = socket_recv
+	                  case message_block[1]
+	                  when :sprout
+	                    sprout(message_block)
+	                  when :all
+	                    all(message_block)
+	                  when :init
+	                    init
+	                  when :quit
+	                    quit
+	                  end
+	                when :init
+	                  init
+	                when :quit
+	                  quit
+	                end
+	              elsif ! $seed[:success].nil?
+	                crop
+	              else
+	                t1.run
+	              end
+							end
             end
           end
           t2.join

data/lib/rows_paths.rb

@@ -9,10 +9,12 @@ class Garden
     module Paths
       
       def all(message_block)
+				$log_abundance.debug("Rows::Paths") {"all"}
         $seed = {:id => Process.pid, :seed => message_block[2], :all => true}
       end
       
       def crop
+				$log_abundance.debug("Rows::Paths") {"crop, seed: #{$seed.inspect}"}
         if $seed[:all]
           socket_send([:crop,:seed_all,$seed,@garden_path])
         else
@@ -22,16 +24,19 @@ class Garden
       end
       
       def init
+				$log_abundance.debug("Rows::Paths") {"init"}
         $init = {:seed => 'init_status', :success => false, :message => 'No Init Message', :id => Process.pid} if $init.nil?
         socket_send([:crop,:init,$init,@garden_path])
       end
       
       def quit
+				$log_abundance.debug("Rows::Paths") {"quit"}
         socket_send([:close,:row,Process.pid,@garden_path])
-        Kernel::exit
+        Thread::exit
       end
       
       def sprout(message_block)
+				$log_abundance.debug("Rows::Paths") {"sprout"}
         $seed = message_block[2]
       end
       

data/lib/seed.rb

@@ -20,6 +20,7 @@ class Seed
   # === Example
   #  system "#{seed.sprout}\n"
   def sprout
+		$log_abundance.debug('seed') {"sprout seed: #{$seed.inspect}"}
     return $seed[:seed]
   end
   

data/test/tc_burst.rb

@@ -1,10 +1,12 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'abundance'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'abundance')
 
 class TestBurst < Test::Unit::TestCase
   
   def test_burst1
+		@log_test.info("Test Burst") {"test burst1..."}
     check_init
     seed_1000x10
     check_init
@@ -16,6 +18,7 @@ class TestBurst < Test::Unit::TestCase
   
   
   def setup
+		@log_test = GlobaLog.logger(STDERR,:info)
     @g = Abundance.gardener(:wheelbarrow => 124, :rows => 8, :init_timeout => 2) do
       Abundance.init_status(true,Process.pid)
       Abundance.grow do |seed|
@@ -33,6 +36,7 @@ class TestBurst < Test::Unit::TestCase
   end
   
   def teardown
+		@log_test.info("test Burst") {"tearing down..."}
     @g.close
   end
   

data/test/tc_high_api.rb

@@ -1,28 +1,37 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'abundance'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'abundance')
 
 class TestHighAPI < Test::Unit::TestCase
+	
+	def setup
+		@log_test = GlobaLog.logger(STDERR,:info)
+	end
   
-  def test_abundance_monothread
+  def test_1_abundance_monothread
+		@log_test.info("Test High API") {"testing 1 thread..."}
     @rows = 1
     set_gardener
     reality_check
   end
   
-  def test_abundance_quadthread
+  def test_2_abundance_quadthread
+		@log_test.info("Test High API") {"testing 4 thread..."}
     @rows = 4
     set_gardener
     reality_check
   end
   
-  def test_abundance_hexthread
+  def test_3_abundance_hexthread
+		@log_test.info("Test High API") {"testing 16 thread..."}
     @rows = 16
     set_gardener
     reality_check
   end
   
   def teardown
+		@log_test.info("Test High API") {"tearing down..."}
     final = @g.close
     assert_kind_of(Hash,final,"close method didn't return a Hash, it returned: #{final.inspect}")
     assert_equal(3,final.size,"Hash returned on close has wrong size, here it is: #{final.inspect}")

data/test/tc_multi_gardener.rb

@@ -1,10 +1,16 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'abundance'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'abundance')
 
 class TestMultiGardener < Test::Unit::TestCase
+	
+	def setup
+		@log_test = GlobaLog.logger(STDERR,:info)
+	end
   
   def test_two_gardeners
+		@log_test.info("Test Multi Gardener") {"test two gardeners..."}
     @rows = 2
     set_gardener1
     set_gardener2

data/test/tc_queue.rb

@@ -1,15 +1,18 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'abundance'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'abundance')
 
 class TestQueue < Test::Unit::TestCase
 	
 	def setup
+		@log_test = GlobaLog.logger(STDERR,:info)
 		@rows = 4
 		set_gardener	
 	end
 	
 	def test_queue
+		@log_test.info("Test Queue") {"test queue..."}
 		check_empty(true)
 		check_finished(true)
 		seed_lots

data/test/tc_robustness.rb

@@ -1,10 +1,16 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'abundance'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'abundance')
 
 class TestRobustness < Test::Unit::TestCase
+	
+	def setup
+		@log_test = GlobaLog.logger(STDERR,:info)
+	end
   
   def test_abundance_robust
+		@log_test.info("Test Robustness") {"test abundance robust..."}
     @seed_size = 124
     @rows = 8
     @init_timeout = 3

data/test/ts_abundance.rb

@@ -1,8 +1,6 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
-
-require 'test/tc_high_api'
-require 'test/tc_robustness'
-require 'test/tc_multi_gardener'
-require 'test/tc_burst'
-require 'test/tc_queue'
+require File.join( File.dirname( File.expand_path(__FILE__)), 'tc_high_api')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'tc_robustness')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'tc_multi_gardener')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'tc_burst')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'tc_queue')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: abundance
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-06 00:00:00 -05:00
+date: 2009-02-27 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: globalog
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.3
+    version: 
 description: 
 email: lp@spiralix.org
 executables: []