Created new directories for trace analyzer and test driver

3 files changed, 22 insertions, 2 deletions

diff --git a/README b/trace_analyzer/README
index 16450df..16450df 100644
--- a/README
+++ b/trace_analyzer/README
diff --git a/run.py b/trace_analyzer/run.py
index 52f0e27..80ae257 100755
--- a/run.py
+++ b/trace_analyzer/run.py
@@ -6,7 +6,8 @@ import sta
 ######################################
 
 def main():
-    myEDF()
+    #myEDF()
+    macTrace()
     #myTrace()
     #switchToTrace()
     #releaseTrace()
@@ -20,7 +21,7 @@ def oneCPU():
     trace.print_records()
 
 def myEDF():
-    test = sta.EDF(g6_list,hooks=[37917307040912])
+    test = sta.EDF(g6_list,hooks=[37917786934190])
     #test = sta.EDF(g6_list)
     test.run_test()
 
@@ -31,6 +32,12 @@ def myTrace():
     trace.print_count(True)
     trace.print_records()
 
+def macTrace():
+    trace = sta.Trace(mac2_list)
+    trace.sort('when',alt='release_time')
+    trace.print_count(True)
+    trace.print_records()
+
 def switchToTrace():
     events_trace = sta.Trace(g6_list)
     events_trace.filter('type==5')
@@ -79,6 +86,9 @@ path + 'st-x19-1.bin',
 path + 'st-x19-2.bin',
 path + 'st-x19-3.bin']
 
+mac2_list = [
+path + 'st-mac2-0.bin']
+
 
 
 ##############
diff --git a/sta.py b/trace_analyzer/sta.py
index 08992d1..4269037 100755
--- a/sta.py
+++ b/trace_analyzer/sta.py
@@ -219,6 +219,8 @@ class EDF:
                 if job.running == False:
                     if job.inversion_start_time==0:
                         job.inversion_start_time=self.now
+                    if self.check_tie(job):
+                        job.inversion_start_time=0
                 elif job.running == True:
                     if job.inversion_start_time > 0:
                         self.check_error(job)
@@ -253,6 +255,14 @@ class EDF:
                 return True
         return False
 
+    def check_tie(self, job):
+        """Returns True if there is another job with the same deadline that is
+        running"""
+        for x in self.jobs:
+            if x.deadline == job.deadline and x.running == True:
+                return True
+        return False
+
     class Job:
         def __init__(self):
             self.release_time = 0