3 files changed, 33 insertions, 9 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)
diff --git a/distill_schedcat_profiles.py b/distill_schedcat_profiles.py
index 8d34904..83c90cb 100755
--- a/distill_schedcat_profiles.py
+++ b/distill_schedcat_profiles.py
@@ -48,14 +48,21 @@ class DataFile(object):
         self.sched = self.conf['scheduler']
         self.overhead = self.conf['overhead']
         self.host  = self.conf['host']
+        self.locks = self.conf['locks'] if 'locks' in self.conf else None
         self.name = name
         self.data = load_csv_file(fname)
 
+    def key(self):
+        if self.locks:
+            return "%s/%s" % (self.sched, self.locks)
+        else:
+            return self.sched
+
 
 def group_by_scheduler(files):
     g = defaultdict(list)
     for f in files:
-        g[f.sched].append(f)
+        g[f.key()].append(f)
     return g
 
 NUM_INDEX = 2
@@ -79,10 +86,14 @@ def write_profiles(files):
     wc   = [row(i, WC_INDEX) for i in xrange(num)]
     header = ['NUM_TASKS'] + [f.overhead.replace('-', '_') for f in files]
 
-    avg_name = '%soh_host=%s_scheduler=%s_stat=avg%s.csv' % \
-        (options.prefix, host, sched, options.tag)
-    wc_name  = '%soh_host=%s_scheduler=%s_stat=wc%s.csv' % \
-        (options.prefix, host, sched, options.tag)
+    if files[0].locks:
+        lock_str = '_locks=%s' % files[0].locks
+    else:
+        lock_str = ''
+    avg_name = '%soh_host=%s_scheduler=%s%s_stat=avg%s.csv' % \
+        (options.prefix, host, sched, lock_str, options.tag)
+    wc_name  = '%soh_host=%s_scheduler=%s%s_stat=wc%s.csv' % \
+        (options.prefix, host, sched, lock_str, options.tag)
 
     print 'Generating %s.' % (avg_name)
     write_csv_file(avg_name, [header] + avg, width=15)
diff --git a/extract-trends.sh b/extract-trends.sh
index 60fa95e..bbcee67 100755
--- a/extract-trends.sh
+++ b/extract-trends.sh
@@ -12,6 +12,7 @@ OVERHEADS=`cat $FILE | awk '/^[^#]/ { print $2 }' | sed 's/,//' | sort | uniq`
 SCHEDULERS=`cat $FILE | awk '/^[^#]/ { print $1 }' | sed 's/,//' | sort | uniq`
 
 #echo "(ii) Dataset contains $OVERHEADS for $SCHEDULERS."
+#exit 1
 
 for S in $SCHEDULERS
 do