hopefully fixed conflict

2 files changed, 26 insertions, 25 deletions

diff --git a/doc/index.txt b/doc/index.txt
index 135579b..600590b 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -31,7 +31,7 @@ Make sure `~/bin` is on your `PATH`.
 
 ## Using Unit-Trace ##
 Command line usage:<br>
-<codeblock>unit-trace &lt;one or more trace files&gt; [flags]</codeblock>.  
+<codeblock>unit-trace &lt;one or more trace files&gt; [flags]</codeblock>.
 
 Each flag turns on or off a unit-trace submodule. The available submodules are
 given below.
@@ -42,7 +42,7 @@ For a quick usage reference (including a list of modules), type `unit-trace` on
 
 ### Example Use Case ###
 Let's assume you're in a directory with a bunch of trace files with
-the extension `.bin`. 
+the extension `.bin`.
 Each trace file is assumed to be the trace of a single CPU, and all trace files in the directory are from the same experimental run.
 (The sample_traces directory, included with Unit Trace, will work for this example.)
 
@@ -80,7 +80,7 @@ Some submodules have further documentation, appearing later in this document.
 
 ### Input Submodules ###
 <table border=1>
-<tr><td>Name</td><td>Flag</td><td>Parameters</td><td>Description</td></tr>
+<tr><th>Name</th><th>Flag</th><th>Parameters</th><th>Description</th></tr>
 <tr>
 <td>trace_parser</td>
 <td>always on, unless/until modules for other trace formats are contributed</td>
@@ -88,7 +88,7 @@ Some submodules have further documentation, appearing later in this document.
 </table>
 ### Filter Submodules ###
 <table border=1>
-<tr><td>Name</td><td>Flag</td><td>Parameters</td><td>Description</td></tr>
+<tr><th>Name</th><th>Flag</th><th>Parameters</th><th>Description</th></tr>
 <tr><td>earliest</td><td>-e</td><td>time</td><td>Filters out records before the given event ID. (Event IDs are assigned in order of event record timestamp, and are displayed by the `stdio_printer` submodule.)</td></tr>
 <tr><td>latest</td><td>-l</td><td>time</td><td>Filters out records after the given event ID.</td></tr>
 <tr><td>skipper</td><td>-s</td><td>number n</td><td>Skips the first n records</td></tr>
@@ -97,24 +97,26 @@ Some submodules have further documentation, appearing later in this document.
 </table>
 ### Test Submodules ###
 <table border=1>
-<tr><td>Name</td><td>Flag</td><td>Options</td><td>Description</td></tr>
+<tr><th>Name</th><th>Flag</th><th>Options</th><th>Description</th></tr>
 <tr><td>gedf_test</td><td>-g</td><td>(None)</td><td>Performs G-EDF testing.</td></tr>
 </table>
 ### Output Submodules ###
 <table border=1>
-<tr><td>Name</td><td>Flag</td><td>Options</td><td>Description</td></tr>
+<tr><th>Name</th><th>Flag</th><th>Options</th><th>Description</th></tr>
 <tr><td>stdout_printer</td><td>-o</td><td>(None)</td><td>Prints records to standard out. You should probably redirect the output to a file when you use this.</td></tr>
 <tr><td>visualizer</td><td>-v</td><td>(None)</td><td>Visualizes records. You should probably use filters in conjunction with this submodule. Otherwise, it'll take forever to render, and do you <i>really</i> want to visualize the <i>entire</i> trace, anyway?</td></tr>
 <tr><td>gedf_inversion_stat_printer</td><td>-i</td><td>number n</td><td>Outputs statistics about G-EDF inversions, and the n longest inversions. (You can specify n as 0 if you want.)</td></tr>
 </table>
 ### Miscellaneous Submodules ###
 <table border=1>
-<tr><td>Name</td><td>Flag</td><td>Options</td><td>Description</td></tr>
+<tr><th>Name</th><th>Flag</th><th>Options</th><th>Description</th></tr>
 <tr><td>progress</td><td>-p</td><td>(None)</td><td>Outputs progress info (e.g number of records parsed so far, total time to process trace) to std error.</td></tr>
 </table>
 
 ## Specific Submodule Documentation ##
 
+If you want to learn more about specific submodules, you are looking in the right place.
+
 ### The Visualizer Module ###
 
 The visualizer can give you an on-the-fly visual representation of the input
@@ -144,7 +146,7 @@ identifier gives the chronological sequence of events in the input stream
 for the relevant task or CPU. The event symbols are as follows:
 
 <table border=1>
-<tr><td>Symbol Description</td><td>Event Type</td><td>Meaning</td></tr>
+<tr><th>Symbol Description</th><th>Event Type</th><th>Meaning</th></tr>
 <tr><td>Large colored bar</td><td>Scheduled</td><td>A job was scheduled during the period spanned by the bar.</td>
 <tr><td>Black triangle</td><td>Suspend (Block)</td><td>A task blocked at this time.</td></tr>
 <tr><td>White triangle</td><td>Resume (Unblock)</td><td>A task resumed execution at this time.</td></tr>
@@ -155,7 +157,7 @@ attached to the x-axis, as is customary, rather than in a CPU's area.)</td></tr>
 <tr><td>Large down arrow</td><td>Deadline</td><td>A job's deadline occurs at this time. (Appears only in Task Mode.)</td></tr>
 <tr><td>Small down arrow</td><td>Deadline</td><td>A job's deadline occurs at this time. (Appears only in CPU Mode. These appear
 attached to the x-axis, as is customary, rather than in a CPU's area.)</td></tr>
-<tr><td>Small colored bar</td><td>Priority Inversion</td><td>(Appears only in conjuction with the gedf_test module.) A priority inversion occurred for some task: that is, the task in question <i>should</i> have been scheduled at the depicted time, but wasn't. In Task Mode these are organized by task (and appear gray since color would be redundant), and in CPU mode they appear at the bottom, colored by task.</td></tr> 
+<tr><td>Small colored bar</td><td>Priority Inversion</td><td>(Appears only in conjuction with the gedf_test module.) A priority inversion occurred for some task: that is, the task in question <i>should</i> have been scheduled at the depicted time, but wasn't. In Task Mode these are organized by task (and appear gray since color would be redundant), and in CPU mode they appear at the bottom, colored by task.</td></tr>
 </table>
 
 If you're unsure as
@@ -170,7 +172,7 @@ being scheduled and being descheduled, respectively. <i>However</i>, if the visu
 finds a start event but not an end event (or vice-versa), it assumes that the corresponding
 event occurred, but at a time not in the input stream.
 In other words, it assumes that such events are genuine. To represent this phenomenon,
-the visualizer shows the bar going "off the graph". 
+the visualizer shows the bar going "off the graph".
 
 Interacting with the visualizer is easy. The scrollbars work in the obvious way. You can also
 use the arrow keys to move, or use Ctrl+arrow keys to move faster. Mousing over an event gives
@@ -246,7 +248,7 @@ Unit-Trace is released under the [Simplified BSD License][license].
 
 ## Credits ##
 This project was created by and is maintained by the [Real-Time Systems Group][group] at the [University of North Carolina at Chapel Hill][uncch],
-[Department of Computer Science][csdept]. A detailed explanation of the tool is available in [this paper][ospert_paper], from 
+[Department of Computer Science][csdept]. A detailed explanation of the tool is available in [this paper][ospert_paper], from
 [the 2009 OSPERT workshop][ospert].
 
 We would like to extend special thanks to Gary Bressler, who created and maintains the `visualizer` submodule as a volunteer with our group.
diff --git a/unit-trace b/unit-trace
index c66f5ac..5362113 100755
--- a/unit-trace
+++ b/unit-trace
@@ -9,20 +9,6 @@
 # Setup
 ################################################################################
 
-# Import the modules we need. You should not need to know about
-# their internals.
-import unit_trace
-from unit_trace import trace_reader
-from unit_trace import sanitizer
-from unit_trace import gedf_test
-from unit_trace import gedf_inversion_stat_printer
-from unit_trace import stdout_printer
-from unit_trace import progress
-from unit_trace import skipper
-from unit_trace import maxer
-from unit_trace import earliest
-from unit_trace import latest
-
 # Get trace files from command line arguments
 from optparse import OptionParser
 usage = "usage: %prog [options] <one or more trace files>"
@@ -59,36 +45,47 @@ if len(traces) < 1:
 # Pipeline
 ################################################################################
 
+# Import the unit_trace module
+import unit_trace
+
 # Read events from traces
+from unit_trace import trace_reader
 stream = trace_reader.trace_reader(traces)
 
 # Skip over records
 if options.skipnum > 0:
+    from unit_trace import skipper
     stream = skipper.skipper(stream, options.skipnum)
 
 # Enforce max number of records to parse
 if options.maxnum > 0:
+    from unit_trace import maxer
     stream = maxer.maxer(stream, options.maxnum)
 
 # Enfore earliest timestamp
 if options.earliest > 0:
+    from unit_trace import earliest
     stream = earliest.earliest(stream,options.earliest)
 
 # Enfore latest timestamp
 if options.latest > 0:
+    from unit_trace import latest
     stream = latest.latest(stream,options.latest)
 
 # Filter out garbage events
 if options.clean is True:
+    from unit_trace import sanitizer
     stream = sanitizer.sanitizer(stream)
 
 # Display progress information using stderr
 # e.g. # records completed so far, total time, etc.
 if options.progress is True:
+    from unit_trace import progress
     stream = progress.progress(stream)
 
 # Produce G-EDF error records
 if options.gedf is True:
+    from unit_trace import gedf_test
     stream = gedf_test.gedf_test(stream)
 
 # Filter some records out
@@ -107,6 +104,7 @@ stream1, stream2, stream3 = itertools.tee(stream,3)
 
 # Call standard out printer
 if options.stdout is True:
+    from unit_trace import stdout_printer
     stdout_printer.stdout_printer(stream1)
 
 # Print G_EDF inversion statistics
@@ -116,6 +114,7 @@ if options.num_inversions > -1:
         sys.stderr.write("You must enable the G-EDF test module to print" +
             " G-EDF inversion statistics\n")
     else:
+        from unit_trace import gedf_inversion_stat_printer
         gedf_inversion_stat_printer.gedf_inversion_stat_printer(stream2,options.num_inversions)
 
 # Call visualizer