Merge pull request #4 from ckenna/wip-cjk

Various fixes to color-scripts.

4 files changed, 8 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 7c62cf4..5d257d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
+config/config.py
 *~
 \#*#
 *.pyc
-.ropeproject*
\ No newline at end of file
+.ropeproject*
diff --git a/config/config.example.py b/config/config.example.py
index 5176460..b307687 100644
--- a/config/config.example.py
+++ b/config/config.example.py
@@ -2,10 +2,14 @@ from __future__ import print_function
 import os
 import sys
 
+"""
+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/ft_tools/ftcat',
+         'ft_tools'    : '/home/hermanjl/git/feather-trace-tools',
          'trace-cmd'   : '/home/hermanjl/git/trace-cmd'}
 
 BINS = {'bespin'    : '{}/bespin'.format(REPOS['liblitmus']),
diff --git a/config/config.py b/config/config.py
deleted file mode 100644
index 5176460..0000000
--- a/config/config.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from __future__ import print_function
-import os
-import sys
-
-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/ft_tools/ftcat',
-         'trace-cmd'   : '/home/hermanjl/git/trace-cmd'}
-
-BINS = {'bespin'    : '{}/bespin'.format(REPOS['liblitmus']),
-        'colorspin' : '{}/colorspin'.format(REPOS['liblitmus']),
-        'rtspin'    : '{}/rtspin'.format(REPOS['liblitmus']),
-        'release'   : '{}/release_ts'.format(REPOS['liblitmus']),
-        'ftcat'     : '{}/ftcat'.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'])}
-
-DEFAULTS = {'params_file' : 'params.py',
-            'sched_file'  : 'sched.py',
-            'exps_file'   : 'exps.py',
-            'duration'    : '10',
-            'spin'                : 'rtspin'}
-
-FILES = {'ft_data'    : 'ft.bin',
-         'linux_data' : 'trace.dat',
-         'sched_data' : 'st-{}.bin',
-         'log_data'   : 'trace.slog'}
-
-PARAMS = {'sched' : 'scheduler',
-          'dur'   : 'duration'}
-
-valid = True
-for repo, loc in REPOS.items():
-    if not os.path.isdir(loc):
-        valid = False
-        print("Cannot access repo '%s' at '%s'" % (repo, loc), file=sys.stderr)
-for prog, loc in BINS.items():
-    if not os.path.isfile(loc):
-        valid = False
-        print("Cannot access program '%s' at '%s'" % (prog, loc), file=sys.stderr)
-if not valid:
-    print("Errors in config file", file=sys.stderr)
diff --git a/run_exps.py b/run_exps.py
index bc15b98..a2d5077 100755
--- a/run_exps.py
+++ b/run_exps.py
@@ -117,7 +117,7 @@ def load_params(fname):
 
 def load_schedule(fname):
     with open(fname, 'r') as f:
-        data = f.read()
+        data = f.read().strip()
     try:
         schedule = eval(data)
     except: