Cleaning up EDF test output for current runnables/runnings

1 files changed, 11 insertions, 4 deletions

diff --git a/sta.py b/sta.py
index 13670ed..8150fc4 100755
--- a/sta.py
+++ b/sta.py
@@ -120,13 +120,16 @@ class Trace:
                       ': ' + str(counts[key]))
         print("")
 
-    def getStr(record):
+    def getStr(record,omitTime=False):
         time = None
         if 'when' in record:
             time = record['when']
         else:
             time = record['release_time']
-        return "{0}: ({1},{2})".format(time,record['pid'],record['job'])
+        if not omitTime:
+            return "{0}: ({1},{2})".format(time,record['pid'],record['job'])
+        else:
+            return "({0},{1})".format(record['pid'],record['job'])
 
 
 ##################
@@ -258,13 +261,17 @@ class EDF:
         """Print the runnable jobs"""
         print("Runnable jobs:")
         for record in self.runnables:
-            print('{0}, {1}'.format(Trace.getStr(record),record['deadline']))
+            print('{0}, Deadline: {1}'.format(Trace.getStr(record,
+                                                           omitTime=True),
+                                              record['deadline']))
 
     def print_runnings(self):
         """Print the runnable jobs"""
         print("Running jobs:")
         for record in self.runnings:
-            print('{0}, {1}'.format(Trace.getStr(record),record['deadline']))
+            print('{0}, Deadline: {1}'.format(Trace.getStr(record,
+                                                           omitTime=True),
+                                              record['deadline']))
 
 
 ####################################