Update mpich pt2pt tests

[simgrid.git] / teshsuite / smpi / mpich3-test / pt2pt / large_message.c

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/large_message.c b/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
index 42d60b7..cc0526a 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/large_message.c
@@ -8,63 +8,69 @@
 #include <stdlib.h>
 #include "mpitest.h"
 
-/* tests send/recv of a message > 2GB. count=270M, type=long long 
+/* tests send/recv of a message > 2GB. count=270M, type=long long
    run with 3 processes to exercise both shared memory and TCP in Nemesis tests*/
 
-int main(int argc, char *argv[]) 
+int main(int argc, char *argv[])
 {
-  int        /* ierr, */ i,size,rank;
-  int        cnt = 270000000;
-  MPI_Status status;
-  long long  *cols;
-  int errs = 0;
+    int ierr, i, size, rank;
+    int cnt = 270000000;
+    int stat_cnt = 0;
+    MPI_Status status;
+    long long *cols;
+    int errs = 0;
 
 
-  MTest_Init(&argc,&argv); 
+    MTest_Init(&argc, &argv);
 
 /* need large memory */
-  if (sizeof(void *) < 8) {
-      MTest_Finalize(errs);
-      MPI_Finalize();
-      return 0;
-  }
+    if (sizeof(void *) < 8) {
+        MTest_Finalize(errs);
+        MPI_Finalize();
+        return 0;
+    }
 
-  /* ierr = */ MPI_Comm_size(MPI_COMM_WORLD,&size);
-  /* ierr = */ MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-  if (size != 3) {
-    fprintf(stderr,"[%d] usage: mpiexec -n 3 %s\n",rank,argv[0]);
-    MPI_Abort(MPI_COMM_WORLD,1);
-    exit(1);
-  }
+    ierr = MPI_Comm_size(MPI_COMM_WORLD, &size);
+    ierr = MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+    if (size != 3) {
+        fprintf(stderr, "[%d] usage: mpiexec -n 3 %s\n", rank, argv[0]);
+        MPI_Abort(MPI_COMM_WORLD, 1);
+    }
 
-  cols = malloc(cnt*sizeof(long long));
-  if (cols == NULL) {
-      printf("malloc of >2GB array failed\n");
-      errs++;
-      MTest_Finalize(errs);
-      MPI_Finalize();
-      return 0;
-  }
+    cols = malloc(cnt * sizeof(long long));
+    if (cols == NULL) {
+        printf("malloc of >2GB array failed\n");
+        errs++;
+        MTest_Finalize(errs);
+        MPI_Finalize();
+        return 0;
+    }
 
-  if (rank == 0) {
-    for (i=0; i<cnt; i++) cols[i] = i;
-    /* printf("[%d] sending...\n",rank);*/
-    /* ierr = */ MPI_Send(cols,cnt,MPI_LONG_LONG_INT,1,0,MPI_COMM_WORLD);
-    /* ierr = */ MPI_Send(cols,cnt,MPI_LONG_LONG_INT,2,0,MPI_COMM_WORLD);
-  } else {
-      /* printf("[%d] receiving...\n",rank); */
-    for (i=0; i<cnt; i++) cols[i] = -1;
-    /* ierr = */ MPI_Recv(cols,cnt,MPI_LONG_LONG_INT,0,0,MPI_COMM_WORLD,&status);
-    /* ierr = MPI_Get_count(&status,MPI_LONG_LONG_INT,&cnt);
-       Get_count still fails because status.count is not 64 bit */
-    for (i=0; i<cnt; i++) {
-        if (cols[i] != i) {
-            /*printf("Rank %d, cols[i]=%lld, should be %d\n", rank, cols[i], i);*/
+    if (rank == 0) {
+        for (i = 0; i < cnt; i++)
+            cols[i] = i;
+        /* printf("[%d] sending...\n",rank); */
+        ierr = MPI_Send(cols, cnt, MPI_LONG_LONG_INT, 1, 0, MPI_COMM_WORLD);
+        ierr = MPI_Send(cols, cnt, MPI_LONG_LONG_INT, 2, 0, MPI_COMM_WORLD);
+    }
+    else {
+        /* printf("[%d] receiving...\n",rank); */
+        for (i = 0; i < cnt; i++)
+            cols[i] = -1;
+        ierr = MPI_Recv(cols, cnt, MPI_LONG_LONG_INT, 0, 0, MPI_COMM_WORLD, &status);
+        ierr = MPI_Get_count(&status,MPI_LONG_LONG_INT,&stat_cnt);
+        if (cnt != stat_cnt) {
+            fprintf(stderr, "Output of MPI_Get_count (%d) does not match expected count (%d).\n", stat_cnt, cnt);
             errs++;
         }
+        for (i = 0; i < cnt; i++) {
+            if (cols[i] != i) {
+                /*printf("Rank %d, cols[i]=%lld, should be %d\n", rank, cols[i], i); */
+                errs++;
+            }
+        }
     }
-  }
-  MTest_Finalize(errs);
-  MPI_Finalize();
-  return 0;
+    MTest_Finalize(errs);
+    MPI_Finalize();
+    return 0;
 }