Bugfix in sanitizer

1 files changed, 15 insertions, 13 deletions

diff --git a/sanitizer.py b/sanitizer.py
index d1764dd..c9f79bf 100644
--- a/sanitizer.py
+++ b/sanitizer.py
@@ -10,7 +10,10 @@
 ###############################################################################
 
 def sanitizer(stream):
-    jobs_released = []
+
+    job_2s_released = [] # list of tasks which have released their job 2s
+    jobs_switched_to = []
+
     for record in stream:
 
         # All records with job < 2 are garbage
@@ -22,25 +25,24 @@ def sanitizer(stream):
 
             # There is a duplicate release of every job 2
             # This will throw away the second one
-            if (record.type_name == 'release' and
-                    (record.pid,record.job) in jobs_released):
-                continue
+            if record.type_name == 'release':
+                if record.pid in job_2s_released:
+                    continue
+                else:
+                    job_2s_released.append(record.pid)
 
             # Job 2 has a resume that is garbage
             if record.type_name == 'resume':
                 continue
 
-        # Record job releases. This helps with filtering out
-        # the second release of job 2 and renumbering final switch_aways
-        # (see below).
-        if record.type_name == 'release':
-            jobs_released.append((record.pid,record.job))
-
         # By default, the switch_away for a job (after it has completed)
-        # is maked as being for job+1, which has not been released.
-        # Correct this.
+        # is maked as being for job+1, which has never been switched to.
+        # We can correct this if we note which jobs really
+        # have been switched to.
+        if record.type_name == 'switch_to':
+            jobs_switched_to.append((record.pid,record.job))
         if record.type_name == 'switch_away':
-            if (record.pid,record.job) not in jobs_released:
+            if (record.pid,record.job) not in jobs_switched_to:
                 record.job -= 1
         
         yield record