Removed 2-step parse for scheduling statistics.

11 files changed, 327 insertions, 444 deletions

diff --git a/common.py b/common.py
index a09ef7c..984f584 100644
--- a/common.py
+++ b/common.py
@@ -1,4 +1,78 @@
+import sys
 from collections import defaultdict
+from textwrap import dedent
+
+def recordtype(typename, field_names, default=0):
+    ''' Mutable namedtuple. Recipe from George Sakkis of MIT.'''
+    field_names = tuple(map(str, field_names))
+    # Create and fill-in the class template
+    numfields = len(field_names)
+    argtxt = ', '.join(field_names)
+    reprtxt = ', '.join('%s=%%r' % f for f in field_names)
+    dicttxt = ', '.join('%r: self.%s' % (f,f) for f in field_names)
+    tupletxt = repr(tuple('self.%s' % f for f in field_names)).replace("'",'')
+    inittxt = '; '.join('self.%s=%s' % (f,f) for f in field_names)
+    itertxt = '; '.join('yield self.%s' % f for f in field_names)
+    eqtxt   = ' and '.join('self.%s==other.%s' % (f,f) for f in field_names)
+    template = dedent('''
+        class %(typename)s(object):
+            '%(typename)s(%(argtxt)s)'
+
+            __slots__  = %(field_names)r
+
+            def __init__(self, %(argtxt)s):
+                %(inittxt)s
+
+            def __len__(self):
+                return %(numfields)d
+
+            def __iter__(self):
+                %(itertxt)s
+
+            def __getitem__(self, index):
+                return getattr(self, self.__slots__[index])
+
+            def __setitem__(self, index, value):
+                return setattr(self, self.__slots__[index], value)
+
+            def todict(self):
+                'Return a new dict which maps field names to their values'
+                return {%(dicttxt)s}
+
+            def __repr__(self):
+                return '%(typename)s(%(reprtxt)s)' %% %(tupletxt)s
+
+            def __eq__(self, other):
+                return isinstance(other, self.__class__) and %(eqtxt)s
+
+            def __ne__(self, other):
+                return not self==other
+
+            def __getstate__(self):
+                return %(tupletxt)s
+
+            def __setstate__(self, state):
+                %(tupletxt)s = state
+    ''') % locals()
+    # Execute the template string in a temporary namespace
+    namespace = {}
+    try:
+        exec template in namespace
+    except SyntaxError, e:
+        raise SyntaxError(e.message + ':\n' + template)
+    cls = namespace[typename]
+
+    # Setup defaults
+    init_defaults = tuple(default for f in field_names)
+    cls.__init__.im_func.func_defaults = init_defaults
+
+    # For pickling to work, the __module__ variable needs to be set to the frame
+    # where the named tuple is created.  Bypass this step in environments where
+    # sys._getframe is not defined (Jython for example).
+    if hasattr(sys, '_getframe') and sys.platform != 'cli':
+        cls.__module__ = sys._getframe(1).f_globals['__name__']
+
+    return cls
 
 def load_params(fname):
     params = defaultdict(int)
diff --git a/config/config.example.py b/config/config.example.py
index 50d30ba..9f24097 100644
--- a/config/config.example.py
+++ b/config/config.example.py
@@ -3,56 +3,43 @@ import os
 import sys
 import itertools
 
-"""
+'''
 These are paths to repository directories.
 
-"""
+'''
 REPOS = {'liblitmus'   : '/home/hermanjl/git/liblitmus',
          'sched_trace' : '/home/hermanjl/git/sched_trace',
-         'analysis'    : '/home/hermanjl/git/overhead-analysis-cjk',
          'ft_tools'    : '/home/hermanjl/git/feather-trace-tools',
          'trace-cmd'   : '/home/hermanjl/git/trace-cmd'}
 
-BINS = {'bespin'    : '{}/bespin'.format(REPOS['liblitmus']),
-        'colorspin' : '{}/colorspin'.format(REPOS['liblitmus']),
-        'rtspin'    : '{}/rtspin'.format(REPOS['liblitmus']),
+BINS = {'rtspin'    : '{}/rtspin'.format(REPOS['liblitmus']),
         'release'   : '{}/release_ts'.format(REPOS['liblitmus']),
         'ftcat'     : '{}/ftcat'.format(REPOS['ft_tools']),
+        'ftsplit'   : '{}/ft2csv'.format(REPOS['ft_tools']),
+        'ftsort'    : '{}/ftsort'.format(REPOS['ft_tools']),
         'st_trace'  : '{}/st_trace'.format(REPOS['ft_tools']),
-        'split'     : '{}/split'.format(REPOS['analysis']),
-        'sort'      : '{}/sort-all'.format(REPOS['analysis']),
-        'analyze'   : '{}/analyze'.format(REPOS['analysis']),
         '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',
             'exps_file'   : 'exps.py',
-            'duration'    : '10',
-            'spin'                : 'rtspin'}
+            'duration'    : 10,
+            'spin'                : 'rtspin',
+            'cycles'      : 2000}
 
 FILES = {'ft_data'    : 'ft.bin',
          'linux_data' : 'trace.dat',
          'sched_data' : 'st-{}.bin',
          'log_data'   : 'trace.slog',}
 
-PARAMS = {'sched'  : 'scheduler',
-          'dur'    : 'duration',
-          'kernel' : 'uname'}
+PARAMS = {'sched' : 'scheduler',
+          'dur'   : 'duration',
+          'kernel': 'uname',
+          'cycles' : 'cpu-frequency'}
 
 SCHED_EVENTS = range(501, 513)
-BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS', 'SEND_RESCHED']
-BASE_EVENTS += ['CQ_ENQUEUE_READ', 'CQ_ENQUEUE_FLUSH', 'CQ_SUBMIT_WORK',
-                'CQ_LOOP_WORK_CHECK', 'CQ_LOOP_PEACE_OUT', 'CQ_LOOP_BRANCH',
-                'CQ_WORK_DO_WORK', 'CQ_WORK_NOTIFY', 'CQ_PHASE_WAIT']
-
-# Expand for mixed-crit
-# TODO don't use split
-CRIT_EVENTS  = ['LVL{}_SCHED', 'LVL{}_RELEASE']
-CRIT_LEVELS  = ['A', 'B', 'C']
-BASE_EVENTS += [s.format(l) for (l,s) in
-                itertools.product(CRIT_LEVELS, CRIT_EVENTS)]
-
+BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS']
 ALL_EVENTS   = ["%s_%s" % (e, t) for (e,t) in
                 itertools.product(BASE_EVENTS, ["START","END"])]
 ALL_EVENTS  += ['RELEASE_LATENCY']
diff --git a/experiment/executable/executable.py b/experiment/executable/executable.py
index b964699..628f711 100644
--- a/experiment/executable/executable.py
+++ b/experiment/executable/executable.py
@@ -4,7 +4,7 @@ import signal
 from ..litmus_util import is_executable
 
 class Executable(object):
-    """Parent object that represents an executable for use in task-sets."""
+    '''Parent object that represents an executable for use in task-sets.'''
 
     def __init__(self, exec_file, extra_args=None, stdout_file = None, stderr_file = None):
         self.exec_file = exec_file
@@ -47,7 +47,7 @@ class Executable(object):
         return " ".join(self.__get_full_command())
 
     def execute(self):
-        """Execute the binary."""
+        '''Execute the binary.'''
         full_command = self.__get_full_command()
         self.sp = subprocess.Popen(full_command, stdout=self.stdout_file,
                 stderr=self.stderr_file, cwd=self.cwd)
@@ -59,15 +59,15 @@ class Executable(object):
         self.sp.send_signal(signal.SIGINT)
 
     def terminate(self):