11 files changed, 600 insertions, 20 deletions

diff --git a/common.py b/common.py
new file mode 100644
index 0000000..a09ef7c
--- /dev/null
+++ b/common.py
@@ -0,0 +1,17 @@
+from collections import defaultdict
+
+def load_params(fname):
+    params = defaultdict(int)
+    with open(fname, 'r') as f:
+        data = f.read()
+    try:
+        parsed = eval(data)
+        # Convert to defaultdict
+        for k in parsed:
+            params[k] = str(parsed[k])
+    except Exception as e:
+        raise IOError("Invalid param file: %s\n%s" % (fname, e))
+
+    return params
+
+
diff --git a/config/config.example.py b/config/config.example.py
index b307687..9675f66 100644
--- a/config/config.example.py
+++ b/config/config.example.py
@@ -1,6 +1,7 @@
 from __future__ import print_function
 import os
 import sys
+import itertools
 
 """
 These are paths to repository directories.
@@ -21,7 +22,8 @@ BINS = {'bespin'    : '{}/bespin'.format(REPOS['liblitmus']),
         'split'     : '{}/split'.format(REPOS['analysis']),
         'sort'      : '{}/sort-all'.format(REPOS['analysis']),
         'analyze'   : '{}/analyze'.format(REPOS['analysis']),
-        'trace-cmd' : '{}/trace-cmd'.format(REPOS['trace-cmd'])}
+        'trace-cmd' : '{}/trace-cmd'.format(REPOS['trace-cmd']),
+        'st_show'   : '{}/st_show'.format(REPOS['sched_trace'])}
 
 DEFAULTS = {'params_file' : 'params.py',
             'sched_file'  : 'sched.py',
@@ -32,11 +34,23 @@ DEFAULTS = {'params_file' : 'params.py',
 FILES = {'ft_data'    : 'ft.bin',
          'linux_data' : 'trace.dat',
          'sched_data' : 'st-{}.bin',
-         'log_data'   : 'trace.slog'}
+         'log_data'   : 'trace.slog',}
 
 PARAMS = {'sched' : 'scheduler',
           'dur'   : 'duration'}
 
+SCHED_EVENTS = range(501, 513)
+BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS']
+
+# Expand for mixed-crit
+# CRIT_EVENTS  = ['LVL{}_SCHED', 'LEVEL{}_RELEASE']
+# CRIT_LEVELS  = ['A', 'B', 'C']
+# BASE_EVENTS += [s.format(l) for (l,s) in
+#                 itertools.product(CRIT_LEVELS, CRIT_EVENTS)]
+
+ALL_EVENTS   = ["%s_%s" % (e, t) for (e,t) in
+                itertools.product(BASE_EVENTS, ["START","END"])]
+
 valid = True
 for repo, loc in REPOS.items():
     if not os.path.isdir(loc):
diff --git a/experiment/tracer.py b/experiment/tracer.py
index d7743ad..ad4ebfe 100644
--- a/experiment/tracer.py
+++ b/experiment/tracer.py
@@ -1,8 +1,10 @@
 import litmus_util
 import os
+import config.config as conf
+
 from operator import methodcaller
 from executable.ftcat import FTcat,Executable
-from config.config import FILES,BINS
+
 
 class Tracer(object):
     def __init__(self, name, output_dir):
@@ -27,11 +29,11 @@ class LinuxTracer(Tracer):
         
         extra_args = ["record", "-e", "sched:sched_switch",
                       "-e", "litmus:*",
-                      "-o", "%s/%s" % (output_dir, FILES['linux_data'])]
+                      "-o", "%s/%s" % (output_dir, conf.FILES['linux_data'])]
         stdout = open('%s/trace-cmd-stdout.txt' % self.output_dir, 'w')
         stderr = open('%s/trace-cmd-stderr.txt' % self.output_dir, 'w')
         
-        execute = Executable(BINS['trace-cmd'], extra_args, stdout, stderr)
+        execute = Executable(conf.BINS['trace-cmd'], extra_args, stdout, stderr)
         self.bins.append(execute)
         
     @staticmethod
@@ -49,7 +51,7 @@ class LogTracer(Tracer):
     def __init__(self, output_dir):
         super(LogTracer, self).__init__("Logger", output_dir)
         
-        out_file = open("%s/%s" % (self.output_dir, FILES['log_data']), 'w')
+        out_file = open("%s/%s" % (self.output_dir, conf.FILES['log_data']), 'w')
 
         cat = (Executable("/bin/cat", [LogTracer.DEVICE_STR]))
         cat.stdout_file = out_file
@@ -62,7 +64,6 @@ class LogTracer(Tracer):
     
 
 class SchedTracer(Tracer):
-    EVENTS = range(501, 510) # not including 511
     DEVICE_STR = '/dev/litmus/sched_trace'
 
     def __init__(self, output_dir):
@@ -74,7 +75,7 @@ class SchedTracer(Tracer):
                 stdout_f = open('%s/st-%d.bin' % (self.output_dir, cpu), 'w')
                 stderr_f = open('%s/st-%d-stderr.txt' % (self.output_dir, cpu), 'w')
                 dev = '{0}{1}'.format(SchedTracer.DEVICE_STR, cpu)
-                ftc = FTcat(BINS['ftcat'], stdout_f, stderr_f, dev, SchedTracer.EVENTS, cpu=cpu)
+                ftc = FTcat(conf.BINS['ftcat'], stdout_f, stderr_f, dev, conf.SCHED_EVENTS, cpu=cpu)
 
                 self.bins.append(ftc)
 
@@ -85,22 +86,14 @@ class SchedTracer(Tracer):
     
 class OverheadTracer(Tracer):
     DEVICE_STR = '/dev/litmus/ft_trace0'
-    EVENTS = [# 'SCHED_START', 'SCHED_END', 'SCHED2_START', 'SCHED2_END',
-            'RELEASE_START', 'RELEASE_END',
-            'LVLA_RELEASE_START', 'LVLA_RELEASE_END',
-            'LVLA_SCHED_START', 'LVLA_SCHED_END',
-            'LVLB_RELEASE_START', 'LVLB_RELEASE_END',
-            'LVLB_SCHED_START', 'LVLB_SCHED_END',
-            'LVLC_RELEASE_START', 'LVLC_RELEASE_END',
-            'LVLC_SCHED_START', 'LVLC_SCHED_END']
 
     def __init__(self, output_dir):
         super(OverheadTracer, self).__init__("Overhead Trace", output_dir)
 
-        stdout_f = open('{0}/{1}'.format(self.output_dir, FILES['ft_data']), 'w')
-        stderr_f = open('{0}/{1}.stderr.txt'.format(self.output_dir, FILES['ft_data']), 'w')
-        ftc = FTcat(BINS['ftcat'], stdout_f, stderr_f,
-                OverheadTracer.DEVICE_STR, OverheadTracer.EVENTS)
+        stdout_f = open('{0}/{1}'.format(self.output_dir, conf.FILES['ft_data']), 'w')
+        stderr_f = open('{0}/{1}.stderr.txt'.format(self.output_dir, conf.FILES['ft_data']), 'w')
+        ftc = FTcat(conf.BINS['ftcat'], stdout_f, stderr_f,
+                OverheadTracer.DEVICE_STR, conf.ALL_EVENTS)
 
         self.bins.append(ftc)
 
diff --git a/parse/__init__.py b/parse/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/parse/__init__.py
diff --git a/parse/dir_map.py b/parse/dir_map.py
new file mode 100644
index 0000000..6e959f2
--- /dev/null
+++ b/parse/dir_map.py
@@ -0,0 +1,104 @@
+import os
+
+from collections import defaultdict
+from point import Type
+
+class TreeNode(object):
+    def __init__(self, parent = None):
+        self.parent = parent
+        self.children = defaultdict(lambda : TreeNode(self))
+        self.values = []
+
+class DirMap(object):
+    def to_csv(self, vals):
+        val_strs = []
+        for key in sorted(vals.keys()):
+            val_strs += ["%s=%s" % (key, vals[key])]
+        return "%s.csv" % ("_".join(val_strs))
+    
+    def __init__(self, out_dir):
+        self.root = TreeNode(None)
+        self.out_dir = out_dir
+        self.values  = []
+
+    def debug_update_node(self, path, keys, value):
+        self.__update_node(path, keys, value)
+
+    def __update_node(self, path, keys, value):
+        node = self.root
+
+        path += [ self.to_csv(keys) ]
+        for p in path:
+            node = node.children[p]