Index: doc/theses/mike_brooks_MMath/benchmarks/list/driver.c
===================================================================
--- doc/theses/mike_brooks_MMath/benchmarks/list/driver.c	(revision ff710572842ce13bd9317182ab348bb093af5256)
+++ doc/theses/mike_brooks_MMath/benchmarks/list/driver.c	(revision bf0c72354fb94ae54d1221a825cee6f582de31af)
@@ -17,8 +17,8 @@
 
 #if defined(NDEBUG) || (defined(__cforall) && !defined(__CFA_DEBUG__))
-    enum { DefaultNumNodes = 1000, DefaultExperimentDurSec = 1, DefaultCheckDoneFreq = 1000, DefaultExperimentDurOpCount = -1 };
+    enum { DefaultNumNodes = 1000, DefaultExperimentDurSec = 1, DefaultCheckClockFreq = 1000, DefaultExperimentDurOpCount = -1 };
     #define TRACE(tp)
 #else 
-    enum { DefaultNumNodes = 10, DefaultExperimentDurSec = 1, DefaultCheckDoneFreq = 2, DefaultExperimentDurOpCount = 20 };
+    enum { DefaultNumNodes = 10, DefaultExperimentDurSec = 1, DefaultCheckClockFreq = 2, DefaultExperimentDurOpCount = 20 };
     static const char * tp_filter
     // = "";
@@ -72,37 +72,26 @@
 )
 
-unsigned int uDefaultPreemption() {
-        return 0;
-}
-
 int main(int argc, const char *argv[]) {
 
 
-    const char * usage_args = "[ExperimentDurSec [CheckDoneFreq [NumNodes [ExperimentDurOpCount]]]]";
+    const char * usage_args = "[ExperimentDurSec [CheckClockFreq [NumNodes [ExperimentDurOpCount]]]]";
     const int static_arg_posns = 4;
 
     unsigned int ExperimentDurSec     = DefaultExperimentDurSec;
-    unsigned int CheckDoneFreq       = DefaultCheckDoneFreq;
+    unsigned int CheckClockFreq       = DefaultCheckClockFreq;
     unsigned int NumNodes             = DefaultNumNodes;
     size_t       ExperimentDurOpCount = DefaultExperimentDurOpCount;
 
-    switch (((argc - 1) < static_arg_posns) ? (argc - 1) : static_arg_posns) {
-      case 4: ExperimentDurOpCount = atol(argv[4]);
-      case 3: NumNodes = atoi(argv[3]);
-      case 2: CheckDoneFreq = atoi(argv[2]);
-      case 1: ExperimentDurSec = atoi(argv[1]);
+    switch ((argc < static_arg_posns) ? argc : static_arg_posns) {
+      case 5: ExperimentDurOpCount = atoi(argv[4]);
+      case 4: NumNodes = atoi(argv[3]);
+      case 3: CheckClockFreq = atoi(argv[2]);
+      case 2: ExperimentDurSec = atoi(argv[1]);
     }
 
-    if (ExperimentDurSec == 0 || CheckDoneFreq == 0 || NumNodes == 0 || ExperimentDurOpCount == 0 ) {
+    if (ExperimentDurSec == 0 || CheckClockFreq == 0 || NumNodes == 0 || ExperimentDurOpCount == 0 ) {
         printf("usage: %s %s\n", argv[0], usage_args);
         return -1;
     }
-
-  #ifdef DISABLE_CLOCK_RECHECK
-    if (ExperimentDurSec != -1) {
-        printf("Error: experiment compiled as fixed-work only.  ExperimentDurSec (currently %d) must be set to -1.\nUsage: %s %s\n", ExperimentDurSec, argv[0], usage_args);
-        return -1;
-    }
-  #endif
 
     ui = (B_UserItem*) malloc( NumNodes * sizeof(B_UserItem) );
@@ -141,25 +130,19 @@
 
     while (elapsed_sec <= (double) ExperimentDurSec && bobs_ops_completed < ExperimentDurOpCount) {
-        for ( int t = 0; t < CheckDoneFreq; t += 1 ) {
+        for ( int t = 0; t < CheckClockFreq; t += 1 ) {
             TRACE('a')
             listedItems[0] =
                 BOP_INIT(lst, ui, listedItems, 0);
             TRACE('b')
-            for ( int privateCurInsert = 1;
-                  (bobs_prog_inserting = privateCurInsert, privateCurInsert < NumNodes);
-                  privateCurInsert += 1
-                ) {
+            for ( bobs_prog_inserting = 1; bobs_prog_inserting < NumNodes; bobs_prog_inserting += 1 ) { 
                 TRACE('-')
-                listedItems[privateCurInsert] =
-                    BOP_INSERT( lst, ui, listedItems, privateCurInsert );
+                listedItems[bobs_prog_inserting] =
+                    BOP_INSERT( lst, ui, listedItems, bobs_prog_inserting );
                 TRACE('+')
             }
             TRACE('c')
-            for ( int privateCurRemove = 1;
-                  (bobs_prog_removing = privateCurRemove, privateCurRemove < NumNodes);
-                  privateCurRemove += 1
-                ) {
+            for ( bobs_prog_removing = 1; bobs_prog_removing < NumNodes; bobs_prog_removing += 1 ) { 
                 TRACE('-')
-                BOP_REMOVE( lst, ui, listedItems, privateCurRemove-1 );
+                BOP_REMOVE( lst, ui, listedItems, bobs_prog_removing-1 );
                 TRACE('+')
             }
@@ -177,15 +160,7 @@
             TRACE('g')
         }
-      #ifndef DISABLE_CLOCK_RECHECK
-        clock_t end = clock();
-        elapsed_sec = ((double)(end - start)) / ((double)CLOCKS_PER_SEC);
-      #endif
-    }
-    #ifdef DISABLE_CLOCK_RECHECK
-    {
         clock_t end = clock();
         elapsed_sec = ((double)(end - start)) / ((double)CLOCKS_PER_SEC);
     }
-    #endif
 
     double mean_op_dur_ns = elapsed_sec / ((double)bobs_ops_completed) * 1000 * 1000 * 1000;
