Add inversion IDs and print them

Makes it easier to find inversion records in output

2 files changed, 9 insertions, 1 deletions

diff --git a/unit_trace/gedf_test.py b/unit_trace/gedf_test.py
index 41bab96..3f4e150 100644
--- a/unit_trace/gedf_test.py
+++ b/unit_trace/gedf_test.py
@@ -88,20 +88,26 @@ class Job(object):
         self.is_complete = False
         self.inversion_start = None
         self.inversion_end = None
+        self.inversion_start_id = None
     def __str__(self):
         return "(%d.%d:%d)" % (self.pid,self.job,self.deadline)
 
 # G-EDF errors: the start or end of an inversion
 class Error(object):
+    id = 0
     def __init__(self, job, eligible, on_cpu):
+        Error.id += 1
+        self.id = Error.id
         self.job = copy.copy(job)
         self.eligible = copy.copy(eligible)
         self.on_cpu = copy.copy(on_cpu)
         self.record_type = 'error'
         if job.inversion_end is None:
             self.type_name = 'inversion_start'
+            job.inversion_start_id = self.id
         else:
             self.type_name = 'inversion_end'
+            self.inversion_start_id = job.inversion_start_id
 
 # Returns the position of a Job in a list, or None
 def _find_job(record,list):
diff --git a/unit_trace/stdout_printer.py b/unit_trace/stdout_printer.py
index d242bb6..4fea95a 100644
--- a/unit_trace/stdout_printer.py
+++ b/unit_trace/stdout_printer.py
@@ -27,12 +27,13 @@ def stdout_printer(stream):
 ###############################################################################
 
 def _print_event(record):
-    print "ID: %d" % (record.id)
+    print "Event ID: %d" % (record.id)
     print "Job: %d.%d" % (record.pid,record.job)
     print "Type: %s" % (record.type_name)
     print "Time: %d" % (record.when)
 
 def _print_inversion_start(record):
+    print "Inversion Record IDs: (%d, U)" % (record.id)
     print "Type: %s" % ("Inversion start")
     print "Time: %d" % (record.job.inversion_start)
     print "Job: %d.%d" % (record.job.pid,record.job.job)
@@ -47,6 +48,7 @@ def _print_inversion_start(record):
     print #newline
 
 def _print_inversion_end(record):
+    print "Inversion record IDs: (%d, %d)" % (record.inversion_start_id,record.id)
     print "Type: %s" % ("Inversion end")
     print "Time: %d" % (record.job.inversion_end)
     print "Duration: %d" % (