From 19ae0602334d028be15701334b3d2314295aef9b Mon Sep 17 00:00:00 2001 From: quix Date: Sat, 13 Sep 2008 07:03:53 -0400 Subject: [PATCH] remove 'quix' sub-module --- contrib/quix/lib/quix/diagnostic.rb | 4 ++-- contrib/quix/lib/quix/kernel.rb | 4 ++-- lib/comp_tree/algorithm.rb | 4 ++-- lib/comp_tree/bucket_ipc.rb | 6 +++--- lib/comp_tree/diagnostic.rb | 1 + lib/comp_tree/driver.rb | 8 ++++---- lib/comp_tree/misc.rb | 1 + lib/comp_tree/node.rb | 4 ++-- lib/comp_tree/quix/builtin/kernel/tap.rb | 1 - lib/comp_tree/quix/diagnostic.rb | 1 - lib/comp_tree/quix/kernel.rb | 1 - lib/comp_tree/tap.rb | 1 + test/test_comp_tree.rb | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) create mode 120000 lib/comp_tree/diagnostic.rb create mode 120000 lib/comp_tree/misc.rb delete mode 120000 lib/comp_tree/quix/builtin/kernel/tap.rb delete mode 120000 lib/comp_tree/quix/diagnostic.rb delete mode 120000 lib/comp_tree/quix/kernel.rb create mode 120000 lib/comp_tree/tap.rb diff --git a/contrib/quix/lib/quix/diagnostic.rb b/contrib/quix/lib/quix/diagnostic.rb index a13980786..983379a57 100644 --- a/contrib/quix/lib/quix/diagnostic.rb +++ b/contrib/quix/lib/quix/diagnostic.rb @@ -1,7 +1,7 @@ -require 'comp_tree/quix/builtin/kernel/tap' +require 'comp_tree/tap' -module CompTree::Quix +module CompTree module Diagnostic def show(desc = nil, stream = STDOUT, &block) if desc diff --git a/contrib/quix/lib/quix/kernel.rb b/contrib/quix/lib/quix/kernel.rb index 5fb22825b..f89302b71 100644 --- a/contrib/quix/lib/quix/kernel.rb +++ b/contrib/quix/lib/quix/kernel.rb @@ -1,8 +1,8 @@ require 'thread' -module CompTree::Quix - module Kernel +module CompTree + module Misc def let yield self end diff --git a/lib/comp_tree/algorithm.rb b/lib/comp_tree/algorithm.rb index 26891b1b1..893f2e11c 100644 --- a/lib/comp_tree/algorithm.rb +++ b/lib/comp_tree/algorithm.rb @@ -1,10 +1,10 @@ -require 'comp_tree/quix/diagnostic' +require 'comp_tree/diagnostic' require 'comp_tree/retriable_fork' module CompTree module Algorithm - include Quix::Diagnostic + include Diagnostic def compute_multithreaded(root, num_threads, use_fork, buckets) trace "Computing #{root.name} with #{num_threads} threads" diff --git a/lib/comp_tree/bucket_ipc.rb b/lib/comp_tree/bucket_ipc.rb index 552982a15..e1786bf42 100644 --- a/lib/comp_tree/bucket_ipc.rb +++ b/lib/comp_tree/bucket_ipc.rb @@ -3,13 +3,13 @@ require 'thread' require 'comp_tree/retriable_fork' -require 'comp_tree/quix/diagnostic' -require 'comp_tree/quix/builtin/kernel/tap' +require 'comp_tree/diagnostic' +require 'comp_tree/tap' module CompTree module BucketIPC class Bucket - include Quix::Diagnostic + include Diagnostic include RetriableFork def initialize(address, timeout, wait_interval) diff --git a/lib/comp_tree/diagnostic.rb b/lib/comp_tree/diagnostic.rb new file mode 120000 index 000000000..2375aa2ec --- /dev/null +++ b/lib/comp_tree/diagnostic.rb @@ -0,0 +1 @@ +../../contrib/quix/lib/quix/diagnostic.rb \ No newline at end of file diff --git a/lib/comp_tree/driver.rb b/lib/comp_tree/driver.rb index 7d080c4f1..ff97ce941 100644 --- a/lib/comp_tree/driver.rb +++ b/lib/comp_tree/driver.rb @@ -1,7 +1,7 @@ require 'comp_tree/bucket_ipc' -require 'comp_tree/quix/diagnostic' -require 'comp_tree/quix/kernel' +require 'comp_tree/diagnostic' +require 'comp_tree/misc' require 'comp_tree/algorithm' require 'comp_tree/node' require 'comp_tree/task_node' @@ -22,8 +22,8 @@ class Driver :wait_interval => 0.02, } - include Quix::Diagnostic #:nodoc: - include Quix::Kernel #:nodoc: + include Diagnostic + include Misc # # Begin a new computation tree. diff --git a/lib/comp_tree/misc.rb b/lib/comp_tree/misc.rb new file mode 120000 index 000000000..39c2c9aea --- /dev/null +++ b/lib/comp_tree/misc.rb @@ -0,0 +1 @@ +../../contrib/quix/lib/quix/kernel.rb \ No newline at end of file diff --git a/lib/comp_tree/node.rb b/lib/comp_tree/node.rb index 2871f4b13..3d130f0df 100644 --- a/lib/comp_tree/node.rb +++ b/lib/comp_tree/node.rb @@ -1,5 +1,5 @@ -require 'comp_tree/quix/diagnostic' +require 'comp_tree/diagnostic' require 'thread' module CompTree @@ -7,7 +7,7 @@ module CompTree # Base class for nodes in the computation tree. # class Node - include Quix::Diagnostic #:nodoc: + include Diagnostic attr_reader :name #:nodoc: diff --git a/lib/comp_tree/quix/builtin/kernel/tap.rb b/lib/comp_tree/quix/builtin/kernel/tap.rb deleted file mode 120000 index 416b736d5..000000000 --- a/lib/comp_tree/quix/builtin/kernel/tap.rb +++ /dev/null @@ -1 +0,0 @@ -../../../../../contrib/quix/lib/quix/builtin/kernel/tap.rb \ No newline at end of file diff --git a/lib/comp_tree/quix/diagnostic.rb b/lib/comp_tree/quix/diagnostic.rb deleted file mode 120000 index 59686465b..000000000 --- a/lib/comp_tree/quix/diagnostic.rb +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/quix/lib/quix/diagnostic.rb \ No newline at end of file diff --git a/lib/comp_tree/quix/kernel.rb b/lib/comp_tree/quix/kernel.rb deleted file mode 120000 index e3297daa1..000000000 --- a/lib/comp_tree/quix/kernel.rb +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/quix/lib/quix/kernel.rb \ No newline at end of file diff --git a/lib/comp_tree/tap.rb b/lib/comp_tree/tap.rb new file mode 120000 index 000000000..df2132882 --- /dev/null +++ b/lib/comp_tree/tap.rb @@ -0,0 +1 @@ +../../contrib/quix/lib/quix/builtin/kernel/tap.rb \ No newline at end of file diff --git a/test/test_comp_tree.rb b/test/test_comp_tree.rb index b5d2488ec..b8ac798b9 100644 --- a/test/test_comp_tree.rb +++ b/test/test_comp_tree.rb @@ -14,7 +14,7 @@ module CompTree DO_FORK = (HAVE_FORK and not ARGV.include?("--no-fork")) module TestCommon - include Quix::Diagnostic + include Diagnostic if ARGV.include?("--bench") def separator