Many bugfixes motivated by some end-to-end testing.

15 files changed, 138 insertions, 73 deletions

diff --git a/common.py b/common.py
index 6d1db97..d080e1a 100644
--- a/common.py
+++ b/common.py
@@ -105,7 +105,7 @@ def recordtype(typename, field_names, default=0):
     namespace = {}
     try:
         exec template in namespace
-    except SyntaxError, e:
+    except SyntaxError as e:
         raise SyntaxError(e.message + ':\n' + template)
     cls = namespace[typename]
 
diff --git a/gen/generators.py b/gen/generators.py
index 09ae979..dd6f1cc 100644
--- a/gen/generators.py
+++ b/gen/generators.py
@@ -53,7 +53,7 @@ GenOption = namedtuple('GenOption', ['name', 'types', 'default', 'help'])
 class BaseGenerator(object):
     '''Creates sporadic task sets with the most common Litmus options.'''
     def __init__(self, name, templates, options, params):
-        self.options = self.__make_options() + options
+        self.options = self.__make_options(params) + options
 
         self.__setup_params(params)
 
@@ -61,11 +61,14 @@ class BaseGenerator(object):
         self.template = "\n".join([TP_RM] + templates)
         self.name     = name
 
-    def __make_options(self):
+    def __make_options(self, params):
         '''Return generic Litmus options.'''
 
         # Guess defaults using the properties of this computer
-        cpus = lu.num_cpus()
+        if 'cpus' in params:
+            cpus = min(map(int, params['cpus']))
+        else:
+            cpus = lu.num_cpus()
         try:
             config = get_config_option("RELEASE_MASTER") and True
         except:
@@ -127,9 +130,10 @@ class BaseGenerator(object):
             f.write(str(Template(self.template, searchList=[exp_params])))
 
         del exp_params['task_set']
+        del exp_params['num_tasks']
         exp_params_file = out_dir + "/" + DEFAULTS['params_file']
         with open(exp_params_file, 'wa') as f:
-            exp_params['scheduler'] = 'CEDF'
+            exp_params['scheduler'] = self.name
             f.write(str(exp_params))
 
     def __setup_params(self, params):
@@ -195,7 +199,7 @@ class BaseGenerator(object):
         col_map = builder.build()
 
         for dp in DesignPointGenerator(self.params):
-            dir_leaf = "sched=%s_%s" % (self.name, col_map.get_encoding(dp))
+            dir_leaf = "sched=%s_%s" % (self.name, col_map.encode(dp))
             dir_path = "%s/%s" % (out_dir, dir_leaf.strip('_'))
 
             if os.path.exists(dir_path):
@@ -225,10 +229,10 @@ class BaseGenerator(object):
                 i+= len(word)
                 res += [word]
                 if i > 80:
-                    print ", ".join(res[:-1])
+                    print(", ".join(res[:-1]))
                     res = ["\t\t "+res[-1]]
                     i = line.index("'")
-            print ", ".join(res)
+            print(", ".join(res))
 
 class PartitionedGenerator(BaseGenerator):
     def __init__(self, name, templates, options, params):
@@ -243,7 +247,7 @@ class PartitionedGenerator(BaseGenerator):
 
 class PedfGenerator(PartitionedGenerator):
     def __init__(self, params={}):
-        super(PedfGenerator, self).__init__("P-EDF", [], [], params)
+        super(PedfGenerator, self).__init__("PSN-EDF", [], [], params)
 
 class CedfGenerator(PartitionedGenerator):
     LEVEL_OPTION = GenOption('level', ['L2', 'L3', 'All'], ['L2'],
@@ -255,4 +259,4 @@ class CedfGenerator(PartitionedGenerator):
 
 class GedfGenerator(BaseGenerator):
     def __init__(self, params={}):
-        super(GedfGenerator, self).__init__("G-EDF", [TP_GLOB_TASK], [], params)
+        super(GedfGenerator, self).__init__("GSN-EDF", [TP_GLOB_TASK], [], params)
diff --git a/parse/dir_map.py b/parse/dir_map.py
index 1c17f40..601dd3b 100644
--- a/parse/dir_map.py
+++ b/parse/dir_map.py
@@ -46,7 +46,7 @@ class DirMap(object):
 
     def remove_childless(self):
         def remove_childless2(node):
-            for key, child in node:
+            for key, child in node.children.items():
                 remove_childless2(child)
                 if not (child.children or child.values):
                     node.children.pop(key)
diff --git a/parse/ft.py b/parse/ft.py
index 5293b00..19453d1 100644
--- a/parse/ft.py
+++ b/parse/ft.py
@@ -3,6 +3,7 @@ import numpy as np
 import os
 import re
 import shutil as sh
+import sys
 import subprocess
 
 from point import Measurement,Type
@@ -28,7 +29,6 @@ def parse_overhead(result, overhead_bin, overhead, cycles, out_dir, err_file):
         raise Exception("Failed (%d) with command: %s" % (ret, " ".join(cmd)))
     if not size:
         os.remove(ovh_fname)
-
     if size and not ret:
         # Map and sort file for stats
         data = np.memmap(ovh_fname, dtype="float32", mode='c')
@@ -47,19 +47,22 @@ def parse_overhead(result, overhead_bin, overhead, cycles, out_dir, err_file):
 
 def sort_ft(ft_file, err_file, out_dir):
     '''Create and return file with sorted overheads from @ft_file.'''
-    out_fname = "{}/{}".format("%s/%s" % (os.getcwd(), out_dir), FT_SORTED_NAME)
+    out_fname = "{}/{}".format(out_dir, FT_SORTED_NAME)
 
     # Sort happens in-place
     sh.copyfile(ft_file, out_fname)
     cmd = [conf.BINS['ftsort'], out_fname]
-    ret = subprocess.call(cmd, cwd="%s/%s" % (os.getcwd(), out_dir), stderr=err_file, stdout=err_file)
 
+    ret = subprocess.call(cmd, cwd=out_dir, stderr=err_file, stdout=err_file)
     if ret:
-        raise Exception("Sort failed with command: %s" % " ".join(cmd))
+        raise Exception("Sort failed (%d) with command: %s" % (ret, " ".join(cmd)))
 
     return out_fname
 
 def extract_ft_data(result, data_dir, work_dir, cycles):
+    data_dir = os.path.abspath(data_dir)
+    work_dir = os.path.abspath(work_dir)
+
     freg = conf.FILES['ft_data'] + "$"
     bins = [f for f in os.listdir(data_dir) if re.match(freg, f)]
 
@@ -67,6 +70,9 @@ def extract_ft_data(result, data_dir, work_dir, cycles):
         return False
 
     bin_file = "{}/{}".format(data_dir, bins[0])
+    if not os.path.getsize(bin_file):
+        sys.stderr.write("Empty feather trace file %s!" % bin_file)
+        return False
 
     with open("%s/%s" % (work_dir, FT_ERR_NAME), 'w') as err_file:
         sorted_bin = sort_ft(bin_file, err_file, work_dir)
diff --git a/parse/sched.py b/parse/sched.py
index ba0df5e..2da0149 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -2,6 +2,7 @@ import config.config as conf
 import os