Updated config and parsing.

2 files changed, 9 insertions, 6 deletions

diff --git a/config/config.py b/config/config.py
index cbac6b2..eed3648 100644
--- a/config/config.py
+++ b/config/config.py
@@ -3,7 +3,7 @@ import itertools
 from common import get_executable_hint,ft_freq
 
 '''Paths to binaries.'''
-BINS = {'rtspin'    : get_executable_hint('rtspin', 'liblitmus'),
+BINS = {'rtspin'    : get_executable_hint('rtspin', 'liblitmus', True),
         'release'   : get_executable_hint('release_ts', 'liblitmus'),
         'ftcat'     : get_executable_hint('ftcat', 'feather-trace-tools'),
         'ftsplit'   : get_executable_hint('ft2csv', 'feather-trace-tools'),
@@ -45,7 +45,7 @@ DEFAULTS = {'params_file' : 'params.py',
 SCHED_EVENTS = range(501, 513)
 
 '''Overhead events.'''
-OVH_BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS']
+OVH_BASE_EVENTS  = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS', 'LOCK', 'UNLOCK']
 OVH_ALL_EVENTS   = ["%s_%s" % (e, t) for (e,t) in
                     itertools.product(OVH_BASE_EVENTS, ["START","END"])]
 OVH_ALL_EVENTS  += ['RELEASE_LATENCY']
diff --git a/parse/ft.py b/parse/ft.py
index 1f05323..1e0947f 100644
--- a/parse/ft.py
+++ b/parse/ft.py
@@ -20,6 +20,7 @@ def parse_overhead(result, overhead_bin, overhead, cycles, out_dir, err_file):
         os.remove(ovh_fname)
     ovh_file = open(ovh_fname, 'w')
 
+    err_file.write("Overhead is %s" % overhead)
     # Extract matching overhead events into a seperate file
     cmd  = [conf.BINS["ftsplit"], "-r", "-b", overhead, overhead_bin]
     ret  = subprocess.call(cmd, cwd=out_dir, stderr=err_file, stdout=ovh_file)
@@ -27,13 +28,14 @@ def parse_overhead(result, overhead_bin, overhead, cycles, out_dir, err_file):
 
     if ret:
         raise Exception("Failed (%d) with command: %s" % (ret, " ".join(cmd)))
-    if not size:
-        os.remove(ovh_fname)
+    #if not size:
+    #    os.remove(ovh_fname)
     if size and not ret:
         # Map and sort file for stats
         data = np.memmap(ovh_fname, dtype="float32", mode='c')
         data /= float(cycles) # Scale for processor speed
         data.sort()
+        print("Have %s of %s" % (len(data), overhead))
 
         m = Measurement("%s-%s" % (overhead_bin, overhead))
         m[Type.Max] = data[-1]
@@ -43,7 +45,7 @@ def parse_overhead(result, overhead_bin, overhead, cycles, out_dir, err_file):
 
         result[overhead] = m
 
-        os.remove(ovh_fname)
+        #os.remove(ovh_fname)
 
 def sort_ft(ft_file, err_file, out_dir):
     '''Create and return file with sorted overheads from @ft_file.'''
@@ -77,9 +79,10 @@ def extract_ft_data(result, data_dir, work_dir, cycles):
         sorted_bin = sort_ft(bin_file, err_file, work_dir)
 
         for event in conf.OVH_BASE_EVENTS:
+            print event
             parse_overhead(result, sorted_bin, event, cycles,
                            work_dir, err_file)
 
-        os.remove(sorted_bin)
+        #os.remove(sorted_bin)
 
     return True