3 files changed, 45 insertions, 40 deletions

diff --git a/unit-trace b/unit-trace
index d0921d5..81b6c02 100755
--- a/unit-trace
+++ b/unit-trace
@@ -15,7 +15,7 @@ import unit_trace
 from unit_trace import trace_reader
 from unit_trace import sanitizer
 from unit_trace import gedf_test
-from unit_trace import stats
+from unit_trace import gedf_inversion_stat_printer
 from unit_trace import stdout_printer
 from unit_trace import viz
 from unit_trace import progress
@@ -90,10 +90,6 @@ if options.progress is True:
 if options.gedf is True:
     stream = gedf_test.gedf_test(stream)
 
-# Produce a statistics record
-if options.num_inversions > -1:
-    stream = stats.stats(stream,options.num_inversions)
-
 # Filter some records out
 #def my_filter(record):
 #    if record.record_type == 'error' and record.type_name == 'inversion_end':
@@ -102,13 +98,20 @@ if options.num_inversions > -1:
 #    return True
 #stream = filter(my_filter, stream)
 
-# Output
-if options.stdout is True and options.visualize is True:
-    import itertools
-    stream1, stream2 = itertools.tee(stream,2)
+# Tee by the number of possible outputs
+# This might cause a performance bottleneck that could be eliminated by
+# checking how many we actually need :-)
+import itertools
+stream1, stream2, stream3 = itertools.tee(stream,3)
+
+# Call standard out printer
+if options.stdout is True:
     stdout_printer.stdout_printer(stream1)
-    viz.visualizer.visualizer(stream2) 
-elif options.stdout is True:
-    stdout_printer.stdout_printer(stream)
-elif options.visualize is True:
-    viz.visualizer.visualizer(stream)
+
+# Print G_EDF inversion statistics
+if options.num_inversions > -1:
+    gedf_inversion_stat_printer.gedf_inversion_stat_printer(stream2,options.num_inversions)
+
+# Call visualizer
+if options.visualize is True:
+    viz.visualizer.visualizer(stream3)
diff --git a/unit_trace/stats.py b/unit_trace/gedf_inversion_stat_printer.py
index 4462ef1..c314389 100644
--- a/unit_trace/stats.py
+++ b/unit_trace/gedf_inversion_stat_printer.py
@@ -1,14 +1,14 @@
 ###############################################################################
 # Description
 ###############################################################################
-# Compute and produce statistics
+# Compute and print G-EDF inversion statistics
 
 
 ###############################################################################
 # Public Functions
 ###############################################################################
 
-def stats(stream,num):
+def gedf_inversion_stat_printer(stream,num):
 
     # State
     min_inversion = -1
@@ -41,8 +41,6 @@ def stats(stream,num):
                     longest_inversions = _sort_longest_inversions(
                         longest_inversions)
 
-        yield record
-
     # We've seen all records.
     # Further update state
     if num_inversions > 0:
@@ -50,18 +48,32 @@ def stats(stream,num):
     else:
         avg_inversion = 0
 
-    # Produce a meta type record with all our information.
-    class Obj(object): pass
-    rec = Obj()
-    rec.record_type = "meta"
-    rec.type_name = "stats"
-    rec.num_inversions = num_inversions
-    rec.min_inversion = min_inversion
-    rec.max_inversion = max_inversion
-    rec.avg_inversion = avg_inversion
-    longest_inversions = _sort_longest_inversions(longest_inversions)
-    rec.longest_inversions = longest_inversions
-    yield rec
+    # Print out our information
+    print "Num inversions: %d" % (num_inversions)
+    print "Min inversion: %d" % (min_inversion)
+    print "Max inversion: %d" % (max_inversion)
+    print "Avg inversion: %d" % (avg_inversion)
+    for inv in longest_inversions:
+        print ""
+        print "Inversion record IDs: (%d, %d)" % (inv.inversion_start_id,
+            inv.id)
+        print("Triggering Event IDs: (%d, %d)" %
+            (inv.inversion_start_triggering_event_id,
+            inv.triggering_event_id))
+        print "Time: %d" % (inv.job.inversion_end)
+        print "Duration: %d" % (
+            inv.job.inversion_end - inv.job.inversion_start)
+        print "Job: %d.%d" % (inv.job.pid,inv.job.job)
+        print "Deadline: %d" % (inv.job.deadline)
+        print "Eligible: ",
+        for job in inv.eligible:
+            print str(job) + " ",
+        print
+        print "On CPU: ",
+        for job in inv.on_cpu:
+            print str(job) + " ",
+        print ""
+
 
 def _sort_longest_inversions(longest_inversions):
     """ Sort longest inversions"""
diff --git a/unit_trace/stdout_printer.py b/unit_trace/stdout_printer.py
index dd1e2bd..b8da9bf 100644
--- a/unit_trace/stdout_printer.py
+++ b/unit_trace/stdout_printer.py
@@ -68,13 +68,3 @@ def _print_inversion_end(record):
     for job in record.on_cpu:
         print str(job) + " ",
     print #newline
-
-def _print_stats(record):
-    print "Inversion statistics"
-    print "Num inversions: %d" % (record.num_inversions)
-    print "Min inversion: %d" % (record.min_inversion)
-    print "Max inversion: %d" % (record.max_inversion)
-    print "Avg inversion: %d" % (record.avg_inversion)
-    for inv in record.longest_inversions:
-        print ""
-        _print_inversion_end(inv)