Index: doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/cpp/cppLock.hpp
===================================================================
--- doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/cpp/cppLock.hpp	(revision bb9b8f0065bcafadbafc5494b6d3578b24719733)
+++ doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/cpp/cppLock.hpp	(revision 119e6c8f901bc2b530edefd71a8bbca7b3c5b1e0)
@@ -17,2 +17,21 @@
 	}
 };
+
+inline void lock( cpp_test_spinlock &a, cpp_test_spinlock &b ) {
+    a.lock(); b.lock();
+}
+inline void lock( cpp_test_spinlock &a, cpp_test_spinlock &b, cpp_test_spinlock &c, cpp_test_spinlock &d ) {
+    a.lock(); b.lock(); c.lock(); d.lock();
+}
+inline void lock( cpp_test_spinlock &a, cpp_test_spinlock &b, cpp_test_spinlock &c, cpp_test_spinlock &d, cpp_test_spinlock &e, cpp_test_spinlock &f, cpp_test_spinlock &g, cpp_test_spinlock &h ) {
+    a.lock(); b.lock(); c.lock(); d.lock(); e.lock(); f.lock(); g.lock(); h.lock();
+}
+inline void unlock( cpp_test_spinlock &a, cpp_test_spinlock &b ) {
+    a.unlock(); b.unlock();
+}
+inline void unlock( cpp_test_spinlock &a, cpp_test_spinlock &b, cpp_test_spinlock &c, cpp_test_spinlock &d ) {
+    a.unlock(); b.unlock(); c.unlock(); d.unlock();
+}
+inline void unlock( cpp_test_spinlock &a, cpp_test_spinlock &b, cpp_test_spinlock &c, cpp_test_spinlock &d, cpp_test_spinlock &e, cpp_test_spinlock &f, cpp_test_spinlock &g, cpp_test_spinlock &h ) {
+    a.unlock(); b.unlock(); c.unlock(); d.unlock(); e.unlock(); f.unlock(); g.unlock(); h.unlock();
+}
Index: doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/run
===================================================================
--- doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/run	(revision bb9b8f0065bcafadbafc5494b6d3578b24719733)
+++ doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/run	(revision 119e6c8f901bc2b530edefd71a8bbca7b3c5b1e0)
@@ -92,8 +92,8 @@
 locks=('2' '4' '8')
 
-num_threads='2 4 8 16 24 32'
+# num_threads='2 4 8 16 24 32'
+num_threads='2 4 8'
 
 # toggle benchmarks
-rand=${false} # prolly not needed
 order=${true}
 
@@ -178,6 +178,6 @@
     if [ ${runCFA} -eq ${true} ] ; then
         cd cfa # CFA RUN
-        print_header 'CFA'
-        ${cfa} ${cfa_flags} ${2} order.cfa -o a.${hostname} > /dev/null 2>&1
+        print_header 'CFA'${3}
+        ${cfa} ${cfa_flags} ${2} order${3}.cfa -o a.${hostname} > /dev/null 2>&1
         run_bench
         rm a.${hostname}
@@ -187,6 +187,6 @@
     if [ ${runCPP} -eq ${true} ] ; then
         cd cpp # CPP RUN
-        print_header 'CPP'
-        ${cpp} ${cpp_flags} ${2} order.cc -o a.${hostname} > /dev/null 2>&1
+        print_header 'CPP'${3}
+        ${cpp} ${cpp_flags} ${2} order${3}.cc -o a.${hostname} > /dev/null 2>&1
         run_bench
         rm a.${hostname}
@@ -198,5 +198,6 @@
 if [ ${order} -eq ${true} ] ; then
     for i in ${!locks[@]}; do
-        run_order ${locks[$i]} ${lock_flags[$i]}
+        run_order ${locks[$i]} ${lock_flags[$i]} ''
+        run_order ${locks[$i]} ${lock_flags[$i]} '-basic'
     done
 fi