Removed 2-step parse for scheduling statistics.

1 files changed, 13 insertions, 26 deletions

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']