MC2 supportHEADmc2-supportmaster

1 files changed, 17 insertions, 4 deletions

diff --git a/config/config.py b/config/config.py
index cfdfb05..599371c 100644
--- a/config/config.py
+++ b/config/config.py
@@ -4,6 +4,7 @@ from common import get_executable_hint,ft_freq
 
 '''Paths to binaries.'''
 BINS = {'rtspin'    : get_executable_hint('rtspin', 'liblitmus'),
+        'mc2spin'   : get_executable_hint('mc2spin', 'liblitmus'),
         'release'   : get_executable_hint('release_ts', 'liblitmus'),
         'ftcat'     : get_executable_hint('ftcat', 'feather-trace-tools'),
         'ftsplit'   : get_executable_hint('ft2csv', 'feather-trace-tools'),
@@ -18,7 +19,8 @@ BINS = {'rtspin'    : get_executable_hint('rtspin', 'liblitmus'),
 FILES = {'params_file' : 'params.py',
          'sched_file'  : 'sched.py',
          'ft_data'     : 'ft.bin',
-         'ft_matches'  : r'(ft.*\.bin$)|(.*\.ft)',
+         'ft_msg_data' : 'ftmsg.bin',
+         'ft_matches'  : r'(ft.*\.bin$)|(ftmsg.*\.bin$)|(.*\.ft)',
          'linux_data'  : 'trace.dat',
          'sched_data'  : 'st-{}.bin',
          'log_data'    : 'trace.slog'}
@@ -38,24 +40,35 @@ PARAMS = {'sched'   : 'scheduler',       # Scheduler used by run_exps
 
 '''Default values for program options.'''
 DEFAULTS = {'duration'    : 10,
-            'prog'        : 'rtspin',
+            #'prog'        : 'rtspin',
+            'prog'        : 'mc2spin',
             'out-gen'     : 'exps',
             'out-run'     : 'run-data',
             'out-parse'   : 'parse-data',
             'out-plot'    : 'plot-data',
-            'cycles'      : ft_freq() or 2000}
+            'cycles'      : ft_freq()} #ft_freq()} # or 2000}
 
 
 '''Default sched_trace events (this is all of them).'''
 SCHED_EVENTS = range(501, 513)
 
 '''Overhead events.'''
-OVH_BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS', 'LOCK', 'UNLOCK']
+#OVH_BASE_EVENTS  = ['SCHED', 'RELEASE', 'RELEASE_C', 'SCHED2', 'TICK', 'CXS', 'LOCK', 'UNLOCK', 'ISR', 'SCHED_A', 'SCHED_C']
+OVH_BASE_EVENTS  = ['SCHED', 'RELEASE', 'RELEASE_C', 'SCHED2', 'TICK', 'CXS', 'ISR', 'SCHED_A', 'SCHED_C']
 OVH_ALL_EVENTS   = ["%s_%s" % (e, t) for (e,t) in
                     itertools.product(OVH_BASE_EVENTS, ["START","END"])]
 OVH_ALL_EVENTS  += ['RELEASE_LATENCY']
+OVH_ALL_EVENTS  += ['RELEASE_LATENCY_A']
+OVH_ALL_EVENTS  += ['RELEASE_LATENCY_B']
+OVH_ALL_EVENTS  += ['RELEASE_LATENCY_C']
 # This event doesn't have a START and END
 OVH_BASE_EVENTS += ['RELEASE_LATENCY']
+OVH_BASE_EVENTS += ['RELEASE_LATENCY_A']
+OVH_BASE_EVENTS += ['RELEASE_LATENCY_B']
+OVH_BASE_EVENTS += ['RELEASE_LATENCY_C']
+
+OVH_MSG_EVENTS = ['SEND_RESCHED_START' , 'SEND_RESCHED_END']
+OVH_BASE_EVENTS += ['SEND_RESCHED']
 
 # If a task is missing more than this many records, its measurements
 # are not included in sched_trace summaries