fix+activate rma test

[simgrid.git] / teshsuite / smpi / mpich3-test / rma / wintest.c

diff --git a/teshsuite/smpi/mpich3-test/rma/wintest.c b/teshsuite/smpi/mpich3-test/rma/wintest.c
index a8a784c..d28f806 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/wintest.c
+++ b/teshsuite/smpi/mpich3-test/rma/wintest.c
@@ -3,7 +3,7 @@
  *  (C) 2001 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
-#include "mpi.h" 
+#include "mpi.h"
 #include "stdio.h"
 #include "mpitest.h"
 
@@ -13,17 +13,17 @@
 #define SIZE1 10
 #define SIZE2 20
 
-int main(int argc, char *argv[]) 
-{ 
-    int rank, destrank, nprocs, A[SIZE2], B[SIZE2], i;
+int main(int argc, char *argv[])
+{
+    int rank, destrank, nprocs, A[SIZE2], i;
     MPI_Comm CommDeuce;
     MPI_Group comm_group, group;
     MPI_Win win;
     int errs = 0, flag;
 
-    MTest_Init(&argc,&argv); 
-    MPI_Comm_size(MPI_COMM_WORLD,&nprocs); 
-    MPI_Comm_rank(MPI_COMM_WORLD,&rank); 
+    MTest_Init(&argc, &argv);
+    MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
     if (nprocs < 2) {
         printf("Run this program with 2 or more processes\n");
@@ -36,27 +36,44 @@ int main(int argc, char *argv[])
         MPI_Comm_group(CommDeuce, &comm_group);
 
         if (rank == 0) {
-            for (i=0; i<SIZE2; i++) A[i] = B[i] = i;
+            int B[SIZE2];
+            for (i = 0; i < SIZE2; i++)
+                A[i] = B[i] = i;
+#ifdef USE_WIN_ALLOCATE
+            int *base_ptr = NULL;
+            MPI_Win_allocate(0, 1, MPI_INFO_NULL, CommDeuce, &base_ptr, &win);
+#else
             MPI_Win_create(NULL, 0, 1, MPI_INFO_NULL, CommDeuce, &win);
+#endif
             destrank = 1;
             MPI_Group_incl(comm_group, 1, &destrank, &group);
             MPI_Win_start(group, 0, win);
-            for (i=0; i<SIZE1; i++)
-                MPI_Put(A+i, 1, MPI_INT, 1, i, 1, MPI_INT, win); 
-            for (i=0; i<SIZE1; i++)
-                MPI_Get(B+i, 1, MPI_INT, 1, SIZE1+i, 1, MPI_INT, win);
+            for (i = 0; i < SIZE1; i++)
+                MPI_Put(A + i, 1, MPI_INT, 1, i, 1, MPI_INT, win);
+            for (i = 0; i < SIZE1; i++)
+                MPI_Get(B + i, 1, MPI_INT, 1, SIZE1 + i, 1, MPI_INT, win);
 
             MPI_Win_complete(win);
 
-            for (i=0; i<SIZE1; i++) 
-                if (B[i] != (-4)*(i+SIZE1)) {
-                    printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4)*(i+SIZE1));
+            for (i = 0; i < SIZE1; i++)
+                if (B[i] != (-4) * (i + SIZE1)) {
+                    printf("Get Error: B[i] is %d, should be %d\n", B[i], (-4) * (i + SIZE1));
                     errs++;
                 }
         }
         else {  /* rank=1 */
-            for (i=0; i<SIZE2; i++) B[i] = (-4)*i;
-            MPI_Win_create(B, SIZE2*sizeof(int), sizeof(int), MPI_INFO_NULL, CommDeuce, &win);
+#ifdef USE_WIN_ALLOCATE
+            int *B;
+            MPI_Win_allocate(SIZE2 * sizeof(int), sizeof(int), MPI_INFO_NULL, CommDeuce, &B, &win);
+#else
+            int B[SIZE2];
+            MPI_Win_create(B, SIZE2 * sizeof(int), sizeof(int), MPI_INFO_NULL, CommDeuce, &win);
+#endif
+            MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win);
+            for (i = 0; i < SIZE2; i++)
+                B[i] = (-4) * i;
+            MPI_Win_unlock(rank, win);
+
             destrank = 0;
             MPI_Group_incl(comm_group, 1, &destrank, &group);
             MPI_Win_post(group, 0, win);
@@ -64,7 +81,7 @@ int main(int argc, char *argv[])
             while (!flag)
                 MPI_Win_test(win, &flag);
 
-            for (i=0; i<SIZE1; i++) {
+            for (i = 0; i < SIZE1; i++) {
                 if (B[i] != i) {
                     printf("Put Error: B[i] is %d, should be %d\n", B[i], i);
                     errs++;
@@ -74,10 +91,10 @@ int main(int argc, char *argv[])
 
         MPI_Group_free(&group);
         MPI_Group_free(&comm_group);
-        MPI_Win_free(&win); 
+        MPI_Win_free(&win);
     }
     MPI_Comm_free(&CommDeuce);
     MTest_Finalize(errs);
     MPI_Finalize();
-    return 0; 
-} 
+    return 0;
+}