1 files changed, 16 insertions, 5 deletions

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)