add checking for contents of read back

Author: wkliao

tests/pio_noncontig.c

@@ -62,6 +62,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h> /* strcpy() */
 #include <unistd.h> /* getopt() */
 
 #include <mpi.h>
@@ -90,7 +91,7 @@ static void
 usage(char *argv0)
 {
     char *help =
-    "Usage: %s [-hvrw | -n num | -k num | -c num | -g num | file_name]\n"
+    "Usage: %s [-hvrw | -n num | -k num | -c num | -g num ] -f file_name\n"
     "       [-h] Print this help\n"
     "       [-v] verbose mode\n"
     "       [-w] performs write only (default: both write and read)\n"
@@ -99,7 +100,7 @@ usage(char *argv0)
     "       [-k num] number of rows    in each global variable (default: %d)\n"
     "       [-c num] number of columns in each global variable (default: %d)\n"
     "       [-g num] gap in bytes between first 2 blocks (default: %d)\n"
-    "       [file_name] output file name\n";
+    "        -f file_name: output file name\n";
     fprintf(stderr, help, argv0, NVARS, NROWS, NCOLS, GAP);
 }
 
@@ -109,12 +110,12 @@ int main(int argc, char **argv)
     extern int optind;
     extern char *optarg;
     char filename[256];
-    int i, err, nerrs=0, rank, nprocs, mode, verbose=0, nvars, nreqs;
-    int gap, ncols_g, nrows, ncols, *blocklen, btype_size, ftype_size;
+    int i, err, nerrs=0, max_nerrs, rank, nprocs, mode, verbose=0, nvars;
+    int nreqs, gap, ncols_g, nrows, ncols, *blocklen, btype_size, ftype_size;
     int do_write, do_read;
     char *buf;
     double timing[2], max_timing[2];
-    MPI_Aint lb, *displace, buf_ext, file_ext;
+    MPI_Aint j, lb, *displace, buf_ext, file_ext;
     MPI_Datatype bufType, fileType, *subTypes;
     MPI_File fh;
     MPI_Offset wlen;
@@ -131,9 +132,10 @@ int main(int argc, char **argv)
     gap     = GAP;
     do_write = 1;
     do_read  = 1;
+    filename[0] = '\0';
 
     /* get command-line arguments */
-    while ((i = getopt(argc, argv, "hvwrn:k:c:g:")) != EOF)
+    while ((i = getopt(argc, argv, "hvwrn:k:c:g:f:")) != EOF)
         switch(i) {
             case 'v': verbose = 1;
                       break;
@@ -162,15 +164,20 @@ int main(int argc, char **argv)
                       break;
             case 'r': do_write = 0;
                       break;
+            case 'f': strcpy(filename, optarg);
+                      break;
+
             case 'h':
             default:  if (rank==0) usage(argv[0]);
                       MPI_Finalize();
                       return 1;
         }
-    if (argv[optind] == NULL)
-        sprintf(filename, "%s.out", argv[0]);
-    else
-        snprintf(filename, 256, "%s", argv[optind]);
+
+    if (filename[0] == '\0') {
+        if (rank==0) usage(argv[0]);
+        MPI_Finalize();
+        return 1;
+    }
 
     /* Calculate number of subarray requests each aggregator writes or reads.
      * Each original MPI process client forwards all its requests to one of
@@ -227,6 +234,13 @@ int main(int argc, char **argv)
     err = MPI_Type_get_extent(bufType, &lb, &buf_ext); ERR
     buf = (char*) calloc(buf_ext, 1);
 
+    for (j=0; j<buf_ext; j++) buf[j] = -1;
+    for (j=0; j<blocklen[0]; j++)
+        buf[j] = (j + rank) % 127;
+    j += gap;
+    for (; j<blocklen[0]+blocklen[1]; j++)
+        buf[j] = (j + rank) % 127;
+
     /* construct file type:
      * + there are nreqs subarrays, each uses a subarray datatype
      * + all subarray datatypes are concatenated into one to be used as fileview
@@ -305,10 +319,32 @@ int main(int argc, char **argv)
 
     /* read from the file */
     if (do_read) {
+        /* reset contents of buffer */
+        for (j=0; j<buf_ext; j++) buf[j] = -1;
+
         MPI_Barrier(MPI_COMM_WORLD);
         timing[1] = MPI_Wtime();
         err = MPI_File_read_at_all(fh, 0, buf, 1, bufType, &status); ERR
         timing[1] = MPI_Wtime() - timing[1];
+
+        /* check contents of read buffer */
+        for (j=0; j<nrows; j++) {
+            char exp = (j + rank) % 127;
+            if (buf[j] != exp) {
+                printf("Error: buf[%zd] expect %d but got %d\n",j,exp,buf[j]);
+                nerrs++;
+                break;
+            }
+        }
+        j += gap;
+        for (; j<nrows * ncols * (nreqs-1); j++) {
+            char exp = (j + rank) % 127;
+            if (buf[j] != exp) {
+                printf("Error: buf[%zd] expect %d but got %d\n",j,exp,buf[j]);
+                nerrs++;
+                break;
+            }
+        }
     }
 
     err = MPI_File_close(&fh); ERR
@@ -317,8 +353,9 @@ int main(int argc, char **argv)
     err = MPI_Type_free(&bufType); ERR
     free(buf);
 
+    MPI_Reduce(&nerrs, &max_nerrs, 1, MPI_INT, MPI_MAX, 0, MPI_COMM_WORLD);
     MPI_Reduce(timing, max_timing, 2, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-    if (rank == 0) {
+    if (max_nerrs == 0 && rank == 0) {
         printf("---------------------------------------------------------\n");
         if (do_write)
             printf("Time of collective write = %.2f sec\n", max_timing[0]);