Bugfix for blocking

1 files changed, 14 insertions, 7 deletions

diff --git a/unit_trace/gedf_test.py b/unit_trace/gedf_test.py
index 0cab857..d4586ce 100644
--- a/unit_trace/gedf_test.py
+++ b/unit_trace/gedf_test.py
@@ -182,7 +182,8 @@ def _gedf_check(eligible,on_cpu,when,m,first_event_this_timestamp):
     all.sort(key=lambda x: 0 if (x in on_cpu) else 1)
     all.sort(key=lambda x: x.deadline)
 
-    # Check those that actually should be running
+    # Check those that actually should be running, to look for priority
+    # inversions
     for x in range(0,min(m,len(all))):
         job = all[x]
 
@@ -201,14 +202,10 @@ def _gedf_check(eligible,on_cpu,when,m,first_event_this_timestamp):
             job.inversion_start = None
             job.inversion_end = None
 
-    # Check those that actually should not be running
+    # Check those that actually should not be running, to record the end of any
+    # priority inversions
     for x in range(m,len(all)):
         job = all[x]
-
-        # It actually is running. We don't care.
-
-        # It isn't running, but an inversion_start exists (i.e. it is still
-        # marked as being inverted)
         if job not in on_cpu and job.inversion_start is not None:
             job.inversion_end = when
             errors.append(Error(job, eligible, on_cpu,
@@ -216,4 +213,14 @@ def _gedf_check(eligible,on_cpu,when,m,first_event_this_timestamp):
             job.inversion_start = None
             job.inversion_end = None
 
+    # Look for priority inversions among blocked tasks and end them
+    all = filter(lambda x:x.is_blocked and x.inversion_start is not None,
+        on_cpu + eligible)
+    for job in all:
+        job.inversion_end = when
+        errors.append(Error(job, eligible, on_cpu,
+            first_event_this_timestamp))
+        job.inversion_start = None
+        job.inversion_end = None
+
     return errors