Added additional events.

2 files changed, 9 insertions, 44 deletions

diff --git a/analyze b/analyze
index 356908e..7cc7b49 100755
--- a/analyze
+++ b/analyze
@@ -25,7 +25,7 @@ opts = [
     ]
 
 defaults = {
-    'cycles'  : 2128,
+    'cycles'  : 2400,
     'extent'  : 0,
     'cutoff'  : None,
     'outlier_file' : None,
@@ -33,7 +33,6 @@ defaults = {
     }
 
 options = None
-iters = None
 
 def fmt_cell(x):
     if type(x) == str:
@@ -52,7 +51,7 @@ def write_header():
     print '#%s' % header[1:]
 
 
-def stats_file(fname, res):
+def stats_file(fname):
     name, ext = splitext(fname)
     conf = decode(name)
 
@@ -74,33 +73,14 @@ def stats_file(fname, res):
                             scale=scale,
                             cutoff=options.cutoff,
                             manual=take_off)
-    info = [conf['scheduler'], conf['overhead'], conf['n']]
-    res.append([x for x in  info + stats])
-
-def merge(x, y):
-    x[3] = x[3] + y[3] # samples
-    x[4] = x[4] + y[4] # filtered
-    x[5] = x[5] + y[5] / iters # max
-    x[6] = x[6] + y[6] / iters # avg
-    x[7] = x[7] + y[7] / iters # min
-    x[8] = x[8] + y[8] / iters # med
-    # The following are kinda nonsense
-    # x[9] = x[9] + y[9] / iters # std
-    # x[10] = x[10] + y[10] / iters # var
-    # # Back to rational
-    # x[11] = x[11] + y[11] / iters # iqrmax
-    # x[12] = x[12] + y[12] / iters # iqrmin
-    return x
+    info = [conf['scheduler'], conf['overhead'], 0]
+    print ", ".join([fmt_cell(x) for x in  info + stats])
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(option_list=opts)
     parser.set_defaults(**defaults)
     (options, files) = parser.parse_args()
 
-    stats = []
-    confs = []
-    res = []
-
     try:
         if options.outlier_file:
             options.outliers = load_outliers(options.outlier_file)
@@ -108,26 +88,8 @@ if __name__ == '__main__':
         write_header()
         for f in files:
             try:
-                stats_file(f, res)
+                stats_file(f)
             except IOError, msg:
                 print >> sys.stderr, msg
-
-        # Collect configurations
-        for i in res:
-            conf = [i[0], i[1], i[2]]
-            if not conf in confs:
-                # print "Adding %s to res" % (", ".join([fmt_cell(x) for x in conf]))
-                confs.append(conf)
-
-        # Reduce configurations
-        for conf in confs:
-            conf_dat = [x for x in res if x[0] == conf[0] and\
-                            x[1] == conf[1] and x[2] == conf[2]]
-            iters = len(conf_dat)
-            first = [conf[0], conf[1], conf[2],0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0]
-            stats.append(reduce(merge, conf_dat, first))
-
-        for r in stats:
-            print ", ".join([fmt_cell(x) for x in r])
     except KeyboardInterrupt:
         pass
diff --git a/split b/split
index 04c5bb3..ba0cfb5 100755
--- a/split
+++ b/split
@@ -2,7 +2,9 @@
 
 SPLITTER=ft2csv
 
-EVENTS="LVLA_RELEASE LVLA_SCHED LVLB_RELEASE LVLB_SCHED LVLC_RELEASE LVLC_SCHED"
+EVENTS="LVLA_RELEASE LVLA_SCHED LVLB_RELEASE LVLB_SCHED LVLC_RELEASE LVLC_SCHED RELEASE SCHED CXS SEND_RESCHED RELEASE_LATENCY"
+# EVENTS="RELEASE SCHED"
+# EVENTS="CXS"
 BE_EVENTS=""
 
 OPTS="-r"
@@ -22,6 +24,7 @@ function do_split() {
             #       LOCAL_OPTS="-a 0"
             # fi
             $SPLITTER $OPTS ${LOCAL_OPTS} $E "$1" >> $TARGET
+            echo "$SPLITTER $OPTS ${LOCAL_OPTS} $E \"$1\" >> $TARGET"
         done
         for E in $BE_EVENTS; do
             echo $E