Added ability to specify units along with -t command-line option

5 files changed, 46 insertions, 12 deletions

diff --git a/doc/index.txt b/doc/index.txt
index e24eb2a..2e80281 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -107,6 +107,14 @@ Some submodules have further documentation, appearing later in this document.
 <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>
+### Submodule Options ###
+<table border=1>
+<tr><th>Name</th><th>Flag</th><th>Options</th><th>Description</th></tr>
+<tr><td>time_per_maj</td><td>-t</td><td>Time per major tick [Optional unit]</td><td>
+This option controls how much time is between each major tick in the visualizer. It should take the form of a number
+with, optionally, an SI unit appended (`ns`, `us`, `ms`, `s` are supported). If you don't specify a unit, unit-trace assumes
+the time to be in milliseconds. </td>
+</table>
 ### Miscellaneous Submodules ###
 <table border=1>
 <tr><th>Name</th><th>Flag</th><th>Options</th><th>Description</th></tr>
@@ -233,9 +241,12 @@ Here, documentation is provided for potentially confusing topics that are not do
 In general, Unit-Trace is agnostic about the units of time used in the trace files.
 This is not expected to change in the future.
 The exception is output modules.
-Currently, some output modules assume time is in nanoseconds; they convert it into milliseconds and print the 'ms' unit indicator, where convenient.
+Currently, some output modules assume time is in nanoseconds; they convert it into milliseconds.
 This behavior may have to be modified in the future if non-nanosecond trace files are used.
 
+However, when specifying time intervals in certain situations for output modules,
+you can specify the units, the default being milliseconds (see the information for the `-v` option).
+
 ## Known Bugs ##
 
 Here, documentation of known bugs is provided.
diff --git a/unit-trace b/unit-trace
index 5362113..fd7b430 100755
--- a/unit-trace
+++ b/unit-trace
@@ -27,7 +27,7 @@ parser.add_option("-o", "--stdout", action="store_true", dest="stdout",
     default=False, help="Use stdout_printer")
 parser.add_option("-v", "--visual", action="store_true", dest="visualize",
     default=False, help="Use visualizer")
-parser.add_option("-t", "--time-per-maj", default=10000000.0, type=float,
+parser.add_option("-t", "--time-per-maj", default='10ms', type=str,
     dest="time_per_maj", help="Time interval between major ticks, in the visualizer")
 parser.add_option("-c", "--clean", action="store_true", dest="clean",
     default=False, help="Use sanitizer to clean garbage records")
@@ -120,4 +120,10 @@ if options.num_inversions > -1:
 # Call visualizer
 if options.visualize is True:
     from unit_trace import viz
-    viz.visualizer.visualizer(stream3, options.time_per_maj)
+    try:
+        nsec_time_per_maj = viz.util.parse_time(options.time_per_maj)
+        viz.visualizer.visualizer(stream3, nsec_time_per_maj)
+    except ValueError:
+        import sys
+        sys.stderr.write("Time expression should be of the form [TIME] [UNIT]")
+
diff --git a/unit_trace/viz/__init__.py b/unit_trace/viz/__init__.py
index 91093c1..118a026 100644
--- a/unit_trace/viz/__init__.py
+++ b/unit_trace/viz/__init__.py
@@ -11,8 +11,8 @@ try:
 except ImportError:
     import sys
 
-    print 'Unit-Trace could not find pycairo and/or pygtk installed on your system. Please\n' \
-            + 'make sure these libraries are installed before attempting to use the visualizer.'
+    sys.stderr.write('Unit-Trace could not find pycairo and/or pygtk installed on your system. Please\n' \
+            + 'make sure these libraries are installed before attempting to use the visualizer.')
     sys.exit(1)
 
 gobject.signal_new('set-scroll-adjustments', viewer.GraphArea, gobject.SIGNAL_RUN_FIRST,
diff --git a/unit_trace/viz/util.py b/unit_trace/viz/util.py
index 430063b..12d65f4 100644
--- a/unit_trace/viz/util.py
+++ b/unit_trace/viz/util.py
@@ -63,6 +63,29 @@ class Sec(TimeUnit):
         if time is None: return time
         return time * 1000000000.0
 
+def parse_time(text):
+    # perhaps the user didn't put a space between the number and
+    # the time unit
+    for i, char in enumerate(text):
+        if char == ' ':
+            break
+        elif char.isalpha():
+            text = text[0:i] + ' ' + text[i:]
+            break
+
+    tokens = text.split()
+
+    if len(tokens) > 2 or len(tokens) == 0:
+        raise ValueError
+
+    unit = None
+    if len(tokens) == 2:
+        unit = parse_unit(tokens[1])
+    else:
+        unit = MilliSec()
+
+    return unit.native_to_nsec(float(tokens[0]))
+
 def parse_unit(expr):
     expr = expr.strip().lower()
 
diff --git a/unit_trace/viz/viewer.py b/unit_trace/viz/viewer.py
index bb1385c..4613c47 100644
--- a/unit_trace/viz/viewer.py
+++ b/unit_trace/viz/viewer.py
@@ -856,14 +856,8 @@ class MainWindow(gtk.Window):
             if ret == gtk.RESPONSE_ACCEPT:
                 err, time = None, None
                 try:
-                    input_tokens = self.text_input_dialog.get_input().split()
-                    if len(input_tokens) > 2:
-                        raise ValueError
+                    time = util.parse_time(self.text_input_dialog.get_input())
 
-                    if len(input_tokens) > 1:
-                        unit = util.parse_unit(input_tokens[1])
-
-                    time = unit.native_to_nsec(float(input_tokens[0]))
                     start, end = self.notebook.get_nth_page(self.notebook.last_page).get_graph_area() \
                                  .get_schedule().get_time_bounds()
                     if time < start or time > end: