drake 0.8.4.1.0.17 → 0.8.4.1.0.18

data/CHANGES.drake

@@ -1,7 +1,7 @@
 
 = Drake Changelog
 
-== Version 0.8.4.1.0.16
+== Version 0.8.4.1.0.16-18
 
 * Merge with latest comp_tree.
 

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.4.1.0.17'
+RAKEVERSION = '0.8.4.1.0.18'
 
 require 'rbconfig'
 require 'fileutils'

data/lib/rake/comp_tree/algorithm.rb

@@ -1,11 +1,7 @@
 
-require 'rake/comp_tree/diagnostic'
-
 module Rake end
 module Rake::CompTree
   module Algorithm
-    include Diagnostic
-
     module_function
 
     def loop_with(leave, again)
@@ -19,7 +15,7 @@ module Rake::CompTree
     end
 
     def compute_multithreaded(root, num_threads)
-      trace "Computing #{root.name} with #{num_threads} threads"
+      #trace "Computing #{root.name} with #{num_threads} threads"
 
       result = nil
 
@@ -34,16 +30,16 @@ module Rake::CompTree
           # wait for main thread
           #
           tree_mutex.synchronize {
-            trace "Thread #{thread_index} waiting to start"
+            #trace "Thread #{thread_index} waiting to start"
             num_threads_in_use += 1
             thread_wake_condition.wait(tree_mutex)
           }
 
           loop_with(:leave, :again) {
             node = tree_mutex.synchronize {
-              trace "Thread #{thread_index} aquired tree lock; begin node search"
+              #trace "Thread #{thread_index} aquired tree lock; begin node search"
               if result
-                trace "Thread #{thread_index} detected finish"
+                #trace "Thread #{thread_index} detected finish"
                 num_threads_in_use -= 1
                 throw :leave
               else
@@ -51,29 +47,29 @@ module Rake::CompTree
                 # Find a node.  The node we obtain, if any, will be locked.
                 #
                 if node = find_node(root)
-                  trace "Thread #{thread_index} found node #{node.name}"
+                  #trace "Thread #{thread_index} found node #{node.name}"
                   node
                 else
-                  trace "Thread #{thread_index}: no node found; sleeping."
+                  #trace "Thread #{thread_index}: no node found; sleeping."
                   thread_wake_condition.wait(tree_mutex)
                   throw :again
                 end
               end
             }
 
-            trace "Thread #{thread_index} computing node"
+            #trace "Thread #{thread_index} computing node"
             node_result = compute_node(node)
-            trace "Thread #{thread_index} node computed; waiting for tree lock"
+            #trace "Thread #{thread_index} node computed; waiting for tree lock"
 
             tree_mutex.synchronize {
-              trace "Thread #{thread_index} acquired tree lock"
-              debug {
-                name = "#{node.name}" + ((node == root) ? " (ROOT NODE)" : "")
-                initial = "Thread #{thread_index} compute result for #{name}: "
-                status = node_result.is_a?(Exception) ? "error" : "success"
-                trace initial + status
-                trace "Thread #{thread_index} node result: #{node_result}"
-              }
+              #trace "Thread #{thread_index} acquired tree lock"
+              #debug {
+              #  name = "#{node.name}" + ((node == root) ? " (ROOT NODE)" : "")
+              #  initial = "Thread #{thread_index} compute result for #{name}: "
+              #  status = node_result.is_a?(Exception) ? "error" : "success"
+              #  trace initial + status
+              #  trace "Thread #{thread_index} node result: #{node_result}"
+              #}
 
               node.result = node_result
 
@@ -95,33 +91,33 @@ module Rake::CompTree
               node_finished_condition.signal
             }
           }
-          trace "Thread #{thread_index} exiting"
+          #trace "Thread #{thread_index} exiting"
         }
       }
 
-      trace "Main: waiting for threads to launch and block."
+      #trace "Main: waiting for threads to launch and block."
       until tree_mutex.synchronize { num_threads_in_use == num_threads }
         Thread.pass
       end
 
       tree_mutex.synchronize {
-        trace "Main: entering main loop"
+        #trace "Main: entering main loop"
         until num_threads_in_use == 0
-          trace "Main: waking threads"
+          #trace "Main: waking threads"
           thread_wake_condition.broadcast
 
           if result
-            trace "Main: detected finish."
+            #trace "Main: detected finish."
             break
           end
 
-          trace "Main: waiting for a node"
+          #trace "Main: waiting for a node"
           node_finished_condition.wait(tree_mutex)
-          trace "Main: got a node"
+          #trace "Main: got a node"
         end
       }
 
-      trace "Main: waiting for threads to finish."
+      #trace "Main: waiting for threads to finish."
       loop_with(:leave, :again) {
         tree_mutex.synchronize {
           if threads.all? { |thread| thread.status == false }
@@ -132,7 +128,7 @@ module Rake::CompTree
         Thread.pass
       }
 
-      trace "Main: computation done."
+      #trace "Main: computation done."
       if result.is_a? Exception
         raise result
       else
@@ -142,12 +138,12 @@ module Rake::CompTree
 
     def find_node(node)
       # --- only called inside shared tree mutex
-      trace "Looking for a node, starting with #{node.name}"
+      #trace "Looking for a node, starting with #{node.name}"
       if node.result
         #
         # already computed
         #
-        trace "#{node.name} has been computed"
+        #trace "#{node.name} has been computed"
         nil
       elsif (children_results = node.find_children_results) and node.try_lock
         #
@@ -160,7 +156,7 @@ module Rake::CompTree
         #
         # locked or children not computed; recurse to children
         #
-        trace "Checking #{node.name}'s children"
+        #trace "Checking #{node.name}'s children"
         node.each_child { |child|
           if next_node = find_node(child)
             return next_node
@@ -172,7 +168,6 @@ module Rake::CompTree
 
     def compute_node(node)
       begin
-        node.trace_compute
         node.compute
       rescue Exception => e
         e

data/lib/rake/comp_tree/driver.rb

@@ -1,5 +1,4 @@
 
-require 'rake/comp_tree/diagnostic'
 require 'rake/comp_tree/algorithm'
 require 'rake/comp_tree/node'
 require 'rake/comp_tree/error'
@@ -13,7 +12,6 @@ module Rake::CompTree
   # responsible for defining nodes and running computations.
   #
   class Driver
-    include Diagnostic
     include Algorithm
     
     #

data/lib/rake/comp_tree/node.rb

@@ -1,5 +1,4 @@
 
-require 'rake/comp_tree/diagnostic'
 require 'thread'
 
 module Rake end
@@ -8,8 +7,6 @@ module Rake::CompTree
   # Base class for nodes in the computation tree.
   # 
   class Node
-    include Diagnostic
-
     attr_reader :name                   #:nodoc:
 
     attr_accessor :parents              #:nodoc:
@@ -98,15 +95,15 @@ module Rake::CompTree
       @children_results = value
     end
 
-    def trace_compute #:nodoc:
-      debug {
-        # --- own mutex
-        trace "Computing #{@name}"
-        raise Error::AssertionFailed if @result
-        raise Error::AssertionFailed unless @mutex.locked?
-        raise Error::AssertionFailed unless @children_results
-      }
-    end
+    #def trace_compute #:nodoc:
+    #  debug {
+    #    # --- own mutex
+    #    trace "Computing #{@name}"
+    #    raise Error::AssertionFailed if @result
+    #    raise Error::AssertionFailed unless @mutex.locked?
+    #    raise Error::AssertionFailed unless @children_results
+    #  }
+    #end
 
     #
     # Compute this node; children must be computed and lock must be
@@ -123,10 +120,10 @@ module Rake::CompTree
     def try_lock #:nodoc:
       # --- shared tree mutex and own mutex
       if @shared_lock == 0 and @mutex.try_lock
-        trace "Locking #{@name}"
+        #trace "Locking #{@name}"
         each_upward { |node|
           node.shared_lock += 1
-          trace "#{node.name} locked by #{@name}: level: #{node.shared_lock}"
+          #trace "#{node.name} locked by #{@name}: level: #{node.shared_lock}"
         }
         true
       else
@@ -136,17 +133,17 @@ module Rake::CompTree
 
     def unlock #:nodoc:
       # --- shared tree mutex and own mutex
-      debug {
-        raise Error::AssertionFailed unless @mutex.locked?
-        trace "Unlocking #{@name}"
-      }
+      #debug {
+      #  raise Error::AssertionFailed unless @mutex.locked?
+      #  trace "Unlocking #{@name}"
+      #}
       each_upward { |node|
         node.shared_lock -= 1
-        debug {
-          if node.shared_lock == 0
-            trace "#{node.name} unlocked by #{@name}"
-          end
-        }
+        #debug {
+        #  if node.shared_lock == 0
+        #    trace "#{node.name} unlocked by #{@name}"
+        #  end
+        #}
       }
       @mutex.unlock
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.4.1.0.17
+  version: 0.8.4.1.0.18
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -04:00
+date: 2009-04-02 00:00:00 -04:00
 default_executable: drake
 dependencies: []