Index: doc/theses/colby_parsons_MMAth/benchmarks/actors/run
===================================================================
--- doc/theses/colby_parsons_MMAth/benchmarks/actors/run	(revision 7ce70e2bb9fd3ca221c6984a10a1060acdf9cb7e)
+++ doc/theses/colby_parsons_MMAth/benchmarks/actors/run	(revision f6afd841c9e0565efe47651f0b6caf5b40692478)
@@ -85,4 +85,6 @@
 }
 
+column_headers="proc\ttime (s)"
+
 # executor config
 batch='100'
@@ -102,30 +104,42 @@
 # static config
 n_static_sends='100000000'
+n_static_sends_slow='10000000'
 
 # dynamic config
 n_dynamic_sends='20000000'
+n_dynamic_sends_slow='2000000'
 
 numtimes=5
 
-# bench_cores='1 2 4 8 16 24 32'
-# bench_cores='1 2 4 8 16 24 32 48'
-bench_cores='48'
+# bench_cores='4 8'
+bench_cores='1 2 4 8 16 24 32 48'
+# bench_cores='48'
+
+# toggle mem collection instead of time (executor only)
+# mem=${true}
+mem=${false}
 
 # toggle benchmarks
-executor=${false}
-matrix=${false}
-repeat=${false}
-balance=${false}
+executor=${true}
+matrix=${true}
+repeat=${true}
+balance=${true}
 static=${true}
 dynamic=${true}
-
-# names=('CFA-LV' 'CFA-NS' 'CFA-R')
+# executor=${false}
+# matrix=${false}
+# repeat=${false}
+# balance=${false}
+# static=${false}
+# dynamic=${false}
+
+# names=('Longest-Victim' 'No-Stealing' 'Random')
 # var_flags=('-D__STEAL=1 -DSEARCH=1' '' '-D__STEAL=1 -DRAND=1')
 
-# names=('CFA-NS')
-# var_flags=('')
-
-names=('CFA')
-var_flags=('-D__STEAL=1 -DSEARCH=1')
+# names=('CFA' 'CFA-EMPTY')
+# var_flags=('' '-DEMPTY')
+
+# names=('CFA')
+# var_flags=('-D__STEAL=1 -DSEARCH=1')
 
 # names=('CFA' 'CFA-STAT')
@@ -134,4 +148,7 @@
 # names=()
 # var_flags=()
+
+names=('CFA')
+var_flags=('')
 
 runCAF=${true}
@@ -139,8 +156,19 @@
 runPROTO=${true}
 runAKKA=${true}
-# runCAF=${false}
-# runUCPP=${false}
-# runPROTO=${false}
-# runAKKA=${false}
+runCAF=${false}
+runUCPP=${false}
+runPROTO=${false}
+runAKKA=${false}
+
+if [ ${missed_gulps} -eq ${true} ] ; then
+    bench_cores='2 4 8 16 24 32 48'
+    column_headers="proc\tmissed\ttime (s)"
+    names=('CFA')
+    var_flags=('-D__STEAL=1 -DSEARCH=1 -DACTOR_STATS_QUEUE_MISSED')
+    runCAF=${false}
+    runUCPP=${false}
+    runPROTO=${false}
+    runAKKA=${false}
+fi
 
 cfa=~/cfa-cc/driver/cfa
@@ -162,5 +190,7 @@
 print_header() {
     echo ${1}':'
-    echo -e "proc\ttime (s)"
+    if [ ${mem} -eq ${false} ] ; then
+        echo -e $column_headers
+    fi
 }
 
@@ -173,5 +203,9 @@
     affinity ${1}
     preprint="${1}\t"
-    repeat_command taskset -c ${taskset} ./a.${hostname} ${pre_args} ${1} ${post_args}
+    if [ ${mem} -eq ${true} ] ; then
+        repeat_command /usr/bin/time -f "%M" taskset -c ${taskset} ./a.${hostname} ${pre_args} ${1} ${post_args} > /dev/null
+    else
+        repeat_command taskset -c ${taskset} ./a.${hostname} ${pre_args} ${1} ${post_args}
+    fi
 }
 
@@ -232,5 +266,9 @@
 # /usr/bin/time -f "%Uu %Ss %Er %Mkb"
 if [ ${executor} -eq ${true} ] ; then
-    echo "executor"
+    if [ ${mem} -eq ${false} ] ; then
+        echo "executor"
+    else
+        echo "mem"
+    fi
     pre_args="40000 100 ${nRounds}"
     post_args="${batch}"
@@ -263,5 +301,14 @@
             set_akka_parallelism ${p}
             affinity ${p}
-            taskset -c ${taskset} sbt ${sbtflags} "run ${pre_args} ${p} ${post_args} ${numtimes}" 2>&1 | grep -v "SLF4J:" | grep -v "Slf4jLogger started" | sed -e "s/\x1b\[0J//"
+            if [ ${mem} -eq ${true} ] ; then
+                t=1
+                while [ ${t} -le ${numtimes} ] ; do
+                    /usr/bin/time -f "%M" taskset -c ${taskset} sbt ${sbtflags} "run ${pre_args} ${p} ${post_args} 1" 2>&1 | grep -v "SLF4J:" | grep -v "Slf4jLogger started" | sed -e "s/\x1b\[0J//" | grep -v "\."
+                    t=`expr ${t} + 1`
+                done
+            else
+                taskset -c ${taskset} sbt ${sbtflags} "run ${pre_args} ${p} ${post_args} ${numtimes}" 2>&1 | grep -v "SLF4J:" | grep -v "Slf4jLogger started" | sed -e "s/\x1b\[0J//"
+            fi
+            
             sbt clean > /dev/null
         done
@@ -424,5 +471,5 @@
         g++ ${prefixCAF} CAFSendStatic.cpp ${suffixCAF} -o a.${hostname} > /dev/null 2>&1
         sed -i "s/max-threads = .*/max-threads = 1/g" caf-application.conf # set CAF parallelism
-        repeat_command taskset -c ${startcore} ./a.${hostname} 'd'
+        repeat_command taskset -c ${startcore} ./a.${hostname} ${n_static_sends_slow}
         rm a.${hostname}
         cd - > /dev/null
@@ -470,5 +517,5 @@
         g++ ${prefixCAF} CAFSendDynamic.cpp ${suffixCAF} -o a.${hostname} > /dev/null 2>&1
         sed -i "s/max-threads = .*/max-threads = 1/g" caf-application.conf # set CAF parallelism
-        repeat_command taskset -c ${startcore} ./a.${hostname} 'd'
+        repeat_command taskset -c ${startcore} ./a.${hostname} ${n_dynamic_sends_slow}
         rm a.${hostname}
         cd - > /dev/null
@@ -479,5 +526,5 @@
         echo 'Akka:'
         set_akka_parallelism 1
-        taskset -c ${startcore} sbt ${sbtflags} "run d ${numtimes}" 2>&1 | grep -v "SLF4J:" | grep -v "Slf4jLogger started" | sed -e "s/\x1b\[0J//"
+        taskset -c ${startcore} sbt ${sbtflags} "run ${n_dynamic_sends_slow} ${numtimes}" 2>&1 | grep -v "SLF4J:" | grep -v "Slf4jLogger started" | sed -e "s/\x1b\[0J//"
         cd - > /dev/null
     fi # done AKKA
@@ -494,5 +541,5 @@
         echo 'ProtoActor:'
         go build -o a.${hostname} > /dev/null 2>&1
-        repeat_command taskset -c ${startcore} ./a.${hostname} 'd'
+        repeat_command taskset -c ${startcore} ./a.${hostname} ${n_dynamic_sends_slow}
         rm a.${hostname}
         cd - > /dev/null
@@ -507,5 +554,5 @@
     for i in ${!names[@]}; do
         echo ${names[$i]}':'
-        echo -e "proc\ttime (s)"
+        echo -e $column_headers
         ${cfa} ${cfa_flags} ${var_flags[$i]} balance.cfa -o a.${hostname} > /dev/null 2>&1
         for p in ${bench_cores} ; do 
@@ -520,5 +567,5 @@
     for i in ${!names[@]}; do
         echo ${names[$i]}':'
-        echo -e "proc\ttime (s)"
+        echo -e $column_headers
         ${cfa} ${cfa_flags} ${var_flags[$i]} -DMULTI balance.cfa -o a.${hostname} > /dev/null 2>&1
         for p in ${bench_cores} ; do