Split scheduling data by task criticality.

6 files changed, 121 insertions, 88 deletions

diff --git a/experiment/experiment.py b/experiment/experiment.py
index a44f798..e6dc92d 100644
--- a/experiment/experiment.py
+++ b/experiment/experiment.py
@@ -40,6 +40,8 @@ class Experiment(object):
         self.finished_dir = finished_dir
         self.proc_entries = proc_entries
         self.executables  = executables
+        self.exec_out = None
+        self.exec_err = None
 
         self.__make_dirs()
         self.__assign_executable_cwds()
@@ -151,23 +153,26 @@ class Experiment(object):
         print "[Exp %s]: %s" % (self.name, msg)
 
     def run_exp(self):
-        self.setup()
-
         succ = False
-        
         try:
-            self.__run_tasks()
-            self.log("Saving results in %s" % self.finished_dir)
-            succ = True
+            self.setup()
+
+            try:
+                self.__run_tasks()
+                self.log("Saving results in %s" % self.finished_dir)
+                succ = True
+            finally:
+                self.teardown()
         finally:
-            self.teardown()
+            self.log("Switching to Linux scheduler")
+            litmus_util.switch_scheduler("Linux")
 
         if succ:
             self.__save_results()
             self.log("Experiment done!")
 
 
-    def setup(self):        
+    def setup(self):
         self.log("Writing %d proc entries" % len(self.proc_entries))
         map(methodcaller('write_proc'), self.proc_entries)
 
@@ -185,13 +190,13 @@ class Experiment(object):
             executable.stdout_file = self.exec_out
             executable.stderr_file = self.exec_err
         map(set_out, self.executables)
-        
+
         time.sleep(4)
 
     def teardown(self):
-        self.exec_out.close()
-        self.exec_err.close()
-        
+        self.exec_out and self.exec_out.close()
+        self.exec_err and self.exec_err.close()
+
         sleep_time = 5
         self.log("Sleeping %d seconds to allow buffer flushing" % sleep_time)
         time.sleep(sleep_time)
@@ -199,6 +204,3 @@ class Experiment(object):
         self.log("Stopping tracers")
         map(methodcaller('stop_tracing'), self.tracers)
 
-        self.log("Switching to Linux scheduler")
-        litmus_util.switch_scheduler("Linux")
-
diff --git a/parse/ft.py b/parse/ft.py
index 20a430e..127e49f 100644
--- a/parse/ft.py
+++ b/parse/ft.py
@@ -12,7 +12,7 @@ def get_ft_output(data_dir, out_dir):
 
     FT_DATA_NAME = "scheduler=x-ft"
     output_file  = "{}/out-ft".format(out_dir)
-    
+
     if os.path.isfile(output_file):
         print("ft-output already exists for %s" % data_dir)
         return output_file
diff --git a/parse/sched.py b/parse/sched.py
index b84e16e..300c569 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -34,7 +34,26 @@ COMPLETION_RECORD = r"(?P<RECORD>" +\
 TaskConfig = namedtuple('TaskConfig', ['cpu','wcet','period','type','level'])
 Task = namedtuple('Task', ['pid', 'config'])
 
+class LeveledArray(object):
+    """
+    Groups statistics by the level of the task to which they apply
+    """
+    def __init__(self, name):
+        self.name = name
+        self.vals = defaultdict(lambda:[])
+
+    def add(self, task, value):
+        self.vals[task.config.level] += [value]
+
+    def write_measurements(self, result):
+        for level, arr in self.vals.iteritems():
+            name = "%s%s" % ("%s-" % level if level else "", self.name)
+            result[name] = Measurement(name).from_array(arr)
+
 def get_st_output(data_dir, out_dir):
+    """
+    Create and return files containing unpacked sched data
+    """
     bin_files = conf.FILES['sched_data'].format(".*")
     bins = [f for f in os.listdir(data_dir) if re.match(bin_files, f)]
 
@@ -70,7 +89,7 @@ def get_tasks(data):
                             (e, match.groupdict(), match.group('RECORD')))
     return ret
 
-def get_tasks_dict(data):
+def get_task_dict(data):
     tasks_list = get_tasks(data)
     tasks_dict = {}
     for t in tasks_list:
@@ -89,17 +108,15 @@ def get_task_exits(data):
         except:
                 raise Exception("Invalid exit record, parsed:\n\t%s\n\t%s" %
                                 (match.groupdict(), m.group('RECORD')))
-        
+
         ret += [m]
     return ret
-        
 
-def extract_tardy_vals(data, exp_point):
-    ratios    = []
-    avg_tards = []
-    max_tards = []
 
-    tasks = get_tasks_dict(data)
+def extract_tardy_vals(task_dict, data, exp_point):
+    ratios    = LeveledArray("miss-ratio")
+    avg_tards = LeveledArray("avg-rel-tardiness")
+    max_tards = LeveledArray("max-rel-tardiness")
 
     for match in re.finditer(TARDY_RECORD, data):
         try:
@@ -114,35 +131,40 @@ def extract_tardy_vals(data, exp_point):
             raise Exception("Invalid tardy record:\n\t%s\n\t%s" %
                             (match.groupdict(), match.group("RECORD")))
 
-        if pid not in tasks:
+        if pid not in task_dict:
             raise Exception("Invalid pid '%d' in tardy record:\n\t%s" %
                             match.group("RECORD"))
-        
-        t = tasks[pid]
-        avg_tards  += [ total_tard / (jobs * t.config.period) ]
-        max_tards  += [ max_tard / t.config.period ]
-        ratios     += [ misses / jobs ]
-
-    exp_point["avg-rel-tard"] = Measurement().from_array(avg_tards)
-    exp_point["max-rel-tard"] = Measurement().from_array(max_tards)
-    exp_point["miss-ratio"]   = Measurement().from_array(ratios)
-
-def extract_variance(data, exp_point):
-    varz = []
+
+        t = task_dict[pid]
+        avg_tards.add(t, total_tard / (jobs * t.config.period))
+        max_tards.add(t, max_tard / t.config.period)
+        ratios.add(t, misses / jobs)
+
+    ratios.write_measurements(exp_point)
+    avg_tards.write_measurements(exp_point)
+    max_tards.write_measurements(exp_point)
+
+def extract_variance(task_dict, data, exp_point):
+    varz = LeveledArray("exec-variance")
     completions = defaultdict(lambda: [])
+    missed = defaultdict(lambda: int())
 
     for match in re.finditer(COMPLETION_RECORD, data):
         try: