Bug fixes from mixed-criticality experiments

3 files changed, 17 insertions, 8 deletions

diff --git a/parse/ft.py b/parse/ft.py
index 127e49f..c915978 100644
--- a/parse/ft.py
+++ b/parse/ft.py
@@ -6,7 +6,10 @@ import subprocess
 
 from point import Measurement,Type
 
-def get_ft_output(data_dir, out_dir):
+def get_ft_output(data_dir, out_dir, force=False):
+    """
+    Create and return files containing sorted and analyzed overhead data
+    """
     bin_file = conf.FILES['ft_data'] + "$"
     bins = [f for f in os.listdir(data_dir) if re.match(bin_file, f)]
 
@@ -14,8 +17,11 @@ def get_ft_output(data_dir, out_dir):
     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
+        if force:
+            os.remove(output_file)
+        else:
+            print("ft-output already exists for %s" % data_dir)
+            return output_file
 
     if len(bins) != 0:
         err_file = open("%s/err-ft" % out_dir, 'w')
diff --git a/parse/sched.py b/parse/sched.py
index 300c569..a65f001 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -50,7 +50,7 @@ class LeveledArray(object):
             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):
+def get_st_output(data_dir, out_dir, force=False):
     """
     Create and return files containing unpacked sched data
     """
@@ -60,7 +60,11 @@ def get_st_output(data_dir, out_dir):
     output_file = "%s/out-st" % out_dir
 
     if os.path.isfile(output_file):
-        return output_file
+        if force:
+            os.remove(output_file)
+        else:
+            print("st-output already exists for %s" % data_dir)
+            return output_file
 
     if len(bins) != 0:
         cmd_arr = [conf.BINS['st_show']]
diff --git a/parse/tuple_table.py b/parse/tuple_table.py
index e6f0cc5..5e98d87 100644
--- a/parse/tuple_table.py
+++ b/parse/tuple_table.py
@@ -24,7 +24,7 @@ class ColMap(object):
         if added < len(kv):
             raise Exception("column map '%s' missed field in map '%s'" %
                             (self.col_list, kv))
-        
+
         return key
 
     def __contains__(self, col):
@@ -58,7 +58,7 @@ class TupleTable(object):
         key = self.col_map.get_key(kv)
         return self.table[key]
 
-    def __reduce(self):
+    def reduce(self):
         if self.reduced:
             raise Exception("cannot reduce twice!")
         self.reduced = True
@@ -67,7 +67,6 @@ class TupleTable(object):
 
     def write_result(self, out_dir):
         dir_map = DirMap(out_dir)
-        self.__reduce()
         for key, point in self.table.iteritems():
             kv = self.col_map.get_map(key)