Num. CPUs produced by trace_reader, not hardcoded

3 files changed, 20 insertions, 6 deletions

diff --git a/gedf_test.py b/gedf_test.py
index 58b88cd..5a3c0c4 100644
--- a/gedf_test.py
+++ b/gedf_test.py
@@ -4,10 +4,6 @@
 
 # G-EDF Test
 
-# TODO:
-#   - Currently assumes 4 CPUs
-
-
 ###############################################################################
 # Imports
 ###############################################################################
@@ -22,21 +18,26 @@ import copy
 def gedf_test(stream):
 
     # Two lists to model the system: tasks occupying a CPU and tasks eligible
-    # to do so.
+    # to do so. Also, m = the number of CPUs.
     eligible = []
     on_cpu = []
+    m = None
 
     # Time of the last record we saw. Only run the G-EDF test when the time
     # is updated.
     last_time = None
 
     for record in stream:
+        if record.record_type != "event":
+            if record.record_type == "meta" and record.type_name == "num_cpus":
+                m = record.num_cpus
+            continue
 
         # Check for inversion starts and ends and yield them.
         # Only to the check when time has moved forward.
         # (It is common to have records with simultaneous timestamps.)
         if last_time is not None and last_time != record.when:
-            errors = _gedf_check(eligible,on_cpu,record.when,4)
+            errors = _gedf_check(eligible,on_cpu,record.when,m)
             for error in errors:
                 yield error
 
diff --git a/sanitizer.py b/sanitizer.py
index c9f79bf..79315cc 100644
--- a/sanitizer.py
+++ b/sanitizer.py
@@ -16,6 +16,11 @@ def sanitizer(stream):
 
     for record in stream:
 
+        # Ignore records which are not events (e.g. the num_cpus record)
+        if record.record_type != 'event':
+            yield record
+            continue
+
         # All records with job < 2 are garbage
         if record.job < 2:
             continue
diff --git a/trace_reader.py b/trace_reader.py
index 31f1812..2e5f65d 100644
--- a/trace_reader.py
+++ b/trace_reader.py
@@ -35,6 +35,14 @@ import struct
 # Generator function returning an iterable over records in a trace file.
 def trace_reader(files):
 
+    # Yield a record indicating the number of CPUs, used by the G-EDF test
+    class Obj: pass
+    record = Obj()
+    record.record_type = "meta"
+    record.type_name = "num_cpus"
+    record.num_cpus = len(files)
+    yield record
+
     # Create iterators for each file and a buffer to store records in
     file_iters = [] # file iterators
     file_iter_buff = [] # file iterator buffers