Merge branch 'master' of ssh://jupiter-cs.cs.unc.edu/home/litmus/overhead-analysisHEADmaster

1 files changed, 16 insertions, 4 deletions

diff --git a/analyze b/analyze
index 3ebb1b4..6da523e 100755
--- a/analyze
+++ b/analyze
@@ -22,11 +22,16 @@ opts = [
 
     o('-o', '--outlier-list', action='store', dest='outlier_file',
       help='list of outliers to remove'),
+
+    o('-m', '--max-value', action='store', dest='maxval', type='float',
+      help='maximum sample threshold (higher values discarded)'),
+
     ]
 
 defaults = {
     'cycles'  : 2128,
     'extent'  : 0,
+    'maxval'  : 1000.0,
     'cutoff'  : None,
     'outlier_file' : None,
     'outliers' : {},
@@ -36,11 +41,11 @@ options = None
 
 def fmt_cell(x):
     if type(x) == str:
-        return "%15s" % x
+        return "%25s" % x
     if type(x) == int:
-        return "%15d" % x
+        return "%25d" % x
     else:
-        return "%15.5f" % x
+        return "%25.5f" % x
 
 def write_header():
     labels = ["Plugin", "Overhead", "#tasks",
@@ -71,10 +76,17 @@ def stats_file(fname):
     stats = bd.compact_file(fname,
                             extent=options.extent,
                             scale=scale,
+                            maxval=options.maxval,
                             cutoff=options.cutoff,
                             manual=take_off)
-    info = [conf['scheduler'], conf['overhead'], conf['n']]
+    if 'locks' in conf:
+        sched = '%s_locks=%s' % (conf['scheduler'], conf['locks'])
+    else:
+        sched = conf['scheduler']
+
+    info = [sched, conf['overhead'], conf['n']]
     print ", ".join([fmt_cell(x) for x in  info + stats])
+    sys.stdout.flush()
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(option_list=opts)