Add initial instrumentation to and fix warnings in DIS stressmarks

Changes:
- Backpoint fix to randInt range
- Instrument benchmarks with time tracking
- assert inputs are correct length to fix compiler warnings

Problems:
- Timing on a per-loop basis is non representative of real-world
  workloads, as we clear the cache after every loop. These all need
  to be re-instrumented to record times for the whole benchmark,
  rather than per-loop.

6 files changed, 32 insertions, 20 deletions

diff --git a/dis/original/Field/field.c b/dis/original/Field/field.c
index a561f72..8565e8c 100644
--- a/dis/original/Field/field.c
+++ b/dis/original/Field/field.c
@@ -22,7 +22,7 @@
 
 
 #define MIN_FIELD_SIZE 16
-#define MAX_FIELD_SIZE 16777216
+#define MAX_FIELD_SIZE (16777216*4) // This has been quadrupled from original
 #define MIN_SEED -2147483647
 #define MAX_SEED -1
 #define MIN_MOD_OFFSET 0
@@ -62,7 +62,7 @@ int main(int argc, char** argv){
 
   unsigned int l;
 
-  fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n);
+  assert(fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n) == 4);
 
   assert((f >= MIN_FIELD_SIZE) && (f <= MAX_FIELD_SIZE));
   assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
@@ -72,12 +72,12 @@ int main(int argc, char** argv){
       int x;
       int index;
       index = 0;
-      fscanf(stdin,"%x", &x);
+      assert(fscanf(stdin,"%x", &x) == 1);
       while(x!=0){
         assert((x >= MIN_TOKEN_VALUE) && (x <= MAX_TOKEN_VALUE));
           token[l].delimiter[index] = (unsigned char )x;
         index++;
-        fscanf(stdin,"%x", &x);
+        assert(fscanf(stdin,"%x", &x) == 1);
       }
       assert((index >= MIN_TOKEN_LENGTH) && (index <= MAX_TOKEN_LENGTH));
         token[l].length = index;
@@ -132,6 +132,7 @@ int main(int argc, char** argv){
         }            
         index++;
     }
+    token[l].subfields++;
     STOP_LOOP
     }
 
diff --git a/dis/original/Matrix/ver2/matrix.c b/dis/original/Matrix/ver2/matrix.c
index 56245a6..957d7c5 100755
--- a/dis/original/Matrix/ver2/matrix.c
+++ b/dis/original/Matrix/ver2/matrix.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <assert.h>
 #include "DISstressmarkRNG.h"
+#include "extra.h"
 
 #define MIN_SEED -2147483647
 #define MAX_SEED -1
@@ -60,6 +61,8 @@
  */
 
 static int dim;
+int argc;
+char** argv;
 
 /*      
  *  matrix * vector     
@@ -329,6 +332,7 @@ void biConjugateGradient(double *value,
   int i;
   int l;
   int ll;
+  SET_UP
 
   alpha = 0;
   beta = 0;
@@ -365,6 +369,7 @@ void biConjugateGradient(double *value,
   iteration = 0;
 
   while ((iteration < maxIterations) && (error > errorTolerance)){
+    START_LOOP
    
     /* 
      *   alpha = (transpose(vectorR) * vectorR) /
@@ -429,6 +434,7 @@ void biConjugateGradient(double *value,
     error = vectorValue(tmpVector1)/vectorValue(vectorB);
 
     iteration++;
+    STOP_LOOP
   }
 
   *actualError = error;
@@ -440,6 +446,7 @@ void biConjugateGradient(double *value,
 
   free(vectorR);
   free(vectorP);
+  WRITE_TO_FILE
 
   return;
 }
@@ -508,9 +515,10 @@ void create_CRS(double *matrixA,
 }
 
 
-
-int main()
+int main(int _argc, char** _argv)
 {
+  argc = _argc;
+  argv = _argv;
   int seed;
   int numberNonzero;
   int maxIterations;
diff --git a/dis/original/Neighborhood/neighborhood.c b/dis/original/Neighborhood/neighborhood.c
index 2d50336..1736d38 100644
--- a/dis/original/Neighborhood/neighborhood.c
+++ b/dis/original/Neighborhood/neighborhood.c
@@ -42,10 +42,10 @@ int main(int argc, char** argv)
   time_t endTime;
   SET_UP
 
-  fscanf(stdin, "%ld %d %d %d %d %d %d %d", 
+  assert(fscanf(stdin, "%ld %d %d %d %d %d %d %d", 
         &seed, &bitDepth, &dimension, &numberLines,
         &minThickness, &maxThickness,
-        &distanceShort, &distanceLong);
+        &distanceShort, &distanceLong) == 8);
 
   assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
   assert((dimension > 0) && (dimension <= MAX_DIMENSION));
@@ -70,7 +70,7 @@ int main(int argc, char** argv)
   endTime = time(NULL);
   WRITE_TO_FILE
 
-  printf(" end time is %d\n", endTime);
+//  printf(" end time is %d\n", endTime);
 
   fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e", 
           values.distShort.deg0.entropy,
diff --git a/dis/original/Pointer/pointer.c b/dis/original/Pointer/pointer.c
index a0aa62e..5671697 100644
--- a/dis/original/Pointer/pointer.c
+++ b/dis/original/Pointer/pointer.c
@@ -20,7 +20,7 @@
 #include "extra.h"
 
 #define MIN_FIELD_SIZE 16
-#define MAX_FIELD_SIZE 16777216
+#define MAX_FIELD_SIZE (16777216*4) // Modifed from original
 #define MIN_WINDOW_SIZE 1
 #define MAX_WINDOW_SIZE 15
 #define MIN_HOP_LIMIT 1
@@ -56,8 +56,8 @@ int main(int argc, char** argv){
   unsigned int l;
   SET_UP
 
- fscanf(stdin, "%lu %u %lu %ld %u", 
-        &f, &l, &maxhops, &seed, &n);
+ assert(fscanf(stdin, "%lu %u %lu %ld %u", 
+        &f, &l, &maxhops, &seed, &n) == 5);
 
  assert ((f >= MIN_FIELD_SIZE) && (f <= MAX_FIELD_SIZE));
  w = (unsigned int) l;
@@ -72,8 +72,8 @@ int main(int argc, char** argv){