Adding timestamp printing next to each event in the EDF test printout

1 files changed, 10 insertions, 5 deletions

diff --git a/sta.py b/sta.py
index 8332c1e..13670ed 100755
--- a/sta.py
+++ b/sta.py
@@ -121,7 +121,12 @@ class Trace:
         print("")
 
     def getStr(record):
-        return "({0},{1})".format(record['pid'],record['job'])
+        time = None
+        if 'when' in record:
+            time = record['when']
+        else:
+            time = record['release_time']
+        return "{0}: ({1},{2})".format(time,record['pid'],record['job'])
 
 
 ##################
@@ -167,12 +172,12 @@ class EDF:
                 check_tuple = self.check_deadline(release_record)
                 if check_tuple[0] == True:
                     print("{0} became running (VALID)"
-                          .format(Trace.getStr(release_record)))
+                          .format(Trace.getStr(record)))
                     self.corrects += 1
                 else:
                     print('='*50)
                     print("{0} became running (INVALID)"
-                          .format(Trace.getStr(release_record)))
+                          .format(Trace.getStr(record)))
                     print('Deadline of {0} greater than deadline of {1} in the following record:'
                           .format(release_record['deadline'],
                                   check_tuple[1]['deadline']))
@@ -188,7 +193,7 @@ class EDF:
                 if release_record:
                     self.runnables.append(release_record)
                     print('{0} went from running to runnable'
-                          .format(Trace.getStr(release_record)))
+                          .format(Trace.getStr(record)))
 
             #Completions
             elif record['type'] == 7:
@@ -196,7 +201,7 @@ class EDF:
                if not release_record:
                    release_record = EDF.pop_job(record,self.runnables)
                print('{0} completed'
-                     .format(Trace.getStr(release_record)))
+                     .format(Trace.getStr(record)))
 
         print('Corrects: {0}'.format(self.corrects))
         print('Errors  : {0}'.format(self.errors))