Added support for blocking

1 files changed, 25 insertions, 3 deletions

diff --git a/unit_trace/gedf_test.py b/unit_trace/gedf_test.py
index 993e99a..0cab857 100644
--- a/unit_trace/gedf_test.py
+++ b/unit_trace/gedf_test.py
@@ -93,6 +93,24 @@ def gedf_test(stream):
             if job.is_complete == False:
                 eligible.append(job)
 
+        # A job has been blocked.
+        elif record.type_name == 'block':
+            pos = _find_job(record,on_cpu)
+            # What if the job is blocked AFTER being switched away?
+            # This is a bug in some versions of LITMUS.
+            if pos is None:
+                pos = _find_job(record,eligible)
+                job = eligible[pos]
+            else:
+                job = on_cpu[pos]
+            job.is_blocked = True
+
+        # A job is resumed
+        elif record.type_name == 'resume':
+            pos = _find_job(record,eligible)
+            job = eligible[pos]
+            job.is_blocked = False
+
         last_time = record.when
         yield record
 
@@ -107,6 +125,7 @@ class Job(object):
         self.job = record.job
         self.deadline = record.deadline
         self.is_complete = False
+        self.is_blocked = False
         self.inversion_start = None
         self.inversion_end = None
         self.inversion_start_id = None
@@ -147,12 +166,15 @@ def _gedf_check(eligible,on_cpu,when,m,first_event_this_timestamp):
     # List of error records to be returned
     errors = []
 
-    # List of all jobs that are not complete
+    # List of all jobs that are contending for the CPU (neither complete nor
+    # blocked)
     all = []
     for x in on_cpu:
-        if x.is_complete is not True:
+        if x.is_complete is not True and x.is_blocked is not True:
+            all.append(x)
+    for x in eligible:
+        if x.is_blocked is not True:
             all.append(x)
-    all += eligible
 
     # Sort by on_cpu and then by deadline. sort() is guaranteed to be stable.
     # Thus, this gives us jobs ordered by deadline with preference to those