Release 11.5.0.0.172

Signed-off-by: Scott Breyer <[email protected]>

Author: sjb017

MpiApps/apps/latency/latency.c

@@ -2,14 +2,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <limits.h>
 
 
 #define MYBUFSIZE 4*1024*1025
+#define WARMING_LOOPS 10
+#define MAX_LOOPS (INT_MAX - WARMING_LOOPS)
 char s_buf[MYBUFSIZE];
 char r_buf[MYBUFSIZE];
 
-int skip = 10;
-
 int main(int argc,char *argv[])
 {
     int myid, numprocs, i;
@@ -28,15 +29,20 @@ int main(int argc,char *argv[])
        MPI_Finalize();
        return 0;
     }    
-    size=atoi(argv[2]);
 
     loop = atoi(argv[1]);
+    if ((loop < 0) || (loop > MAX_LOOPS)) {
+        fprintf(stderr, "Maximum loops count is %d, minimum is 0\n", MAX_LOOPS);
+        MPI_Finalize();
+        return 0;
+    }
 
-     if(size > MYBUFSIZE){
-            fprintf(stderr, "Maximum message size is %d\n",MYBUFSIZE);
-            MPI_Finalize();
-            return 0;
-     }
+    size=atoi(argv[2]);
+    if ((size < 0) || (size > MYBUFSIZE)) {
+        fprintf(stderr, "Maximum message size is %d, minimum is 0\n", MYBUFSIZE);
+        MPI_Finalize();
+        return 0;
+    }
 
     /* touch the data */
     for ( i=0; i<size; i++ ){
@@ -48,15 +54,15 @@ int main(int argc,char *argv[])
 
     if (myid == 0)
     {
-        for ( i=0; i< loop+skip; i++ ) {
-            if ( i == skip ) t_start=MPI_Wtime();
+        for ( i=0; i < loop + WARMING_LOOPS; i++ ) {
+            if ( i == WARMING_LOOPS ) t_start=MPI_Wtime();
             MPI_Send(s_buf, size, MPI_CHAR, 1, i, MPI_COMM_WORLD);
             MPI_Recv(r_buf, size, MPI_CHAR, 1, i + 1000, MPI_COMM_WORLD, &stat);
         }
         t_end=MPI_Wtime();
 
     }else{
-        for ( i=0; i< loop+skip; i++ ) {
+        for ( i=0; i < loop + WARMING_LOOPS; i++ ) {
             MPI_Recv(r_buf, size, MPI_CHAR, 0, i, MPI_COMM_WORLD, &stat);
             MPI_Send(s_buf, size, MPI_CHAR, 0, i + 1000, MPI_COMM_WORLD);
         }