X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/826897d361add5db3272a9810e70371a40ba1660..5ca17dc381bb7fba4f2689143e2080f7549ee0ab:/teshsuite/smpi/mpich3-test/rma/test2_am.c

diff --git a/teshsuite/smpi/mpich3-test/rma/test2_am.c b/teshsuite/smpi/mpich3-test/rma/test2_am.c
index 53780d5a44..c3fb52965a 100644
--- a/teshsuite/smpi/mpich3-test/rma/test2_am.c
+++ b/teshsuite/smpi/mpich3-test/rma/test2_am.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"
 #include "squelch.h"
@@ -15,17 +15,17 @@
 #define SIZE1 100
 #define SIZE2 200
 
-int main(int argc, char *argv[]) 
-{ 
+int main(int argc, char *argv[])
+{
     int rank, destrank, nprocs, *A, *B, i;
     MPI_Comm CommDeuce;
     MPI_Group comm_group, group;
     MPI_Win win;
     int errs = 0;
 
-    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");
@@ -34,66 +34,90 @@ int main(int argc, char *argv[])
 
     MPI_Comm_split(MPI_COMM_WORLD, (rank < 2), rank, &CommDeuce);
 
-    if (rank < 2)
-    {
+    if (rank < 2) {
 
         i = MPI_Alloc_mem(SIZE2 * sizeof(int), MPI_INFO_NULL, &A);
         if (i) {
             printf("Can't allocate memory in test program\n");
             MPI_Abort(MPI_COMM_WORLD, 1);
         }
-        i = MPI_Alloc_mem(SIZE2 * sizeof(int), MPI_INFO_NULL, &B);
-        if (i) {
-            printf("Can't allocate memory in test program\n");
-            MPI_Abort(MPI_COMM_WORLD, 1);
-        }
 
         MPI_Comm_group(CommDeuce, &comm_group);
 
         if (rank == 0) {
-            for (i=0; i<SIZE2; i++) A[i] = B[i] = i;
+            i = MPI_Alloc_mem(SIZE2 * sizeof(int), MPI_INFO_NULL, &B);
+            if (i) {
+                printf("Can't allocate memory in test program\n");
+                MPI_Abort(MPI_COMM_WORLD, 1);
+            }
+
+            for (i = 0; i < SIZE2; i++)
+                A[i] = B[i] = i;
+#ifdef USE_WIN_ALLOCATE
+            char *base_ptr;
+            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)) {
-                    SQUELCH( 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)) {
+                    SQUELCH(printf
+                            ("Get Error: B[i] is %d, should be %d\n", B[i], (-4) * (i + SIZE1)););
                     errs++;
                 }
+
+            MPI_Free_mem(B);
         }
         else if (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
+            MPI_Win_allocate(SIZE2 * sizeof(int), sizeof(int), MPI_INFO_NULL, CommDeuce, &B, &win);
+#else
+            i = MPI_Alloc_mem(SIZE2 * sizeof(int), MPI_INFO_NULL, &B);
+            if (i) {
+                printf("Can't allocate memory in test program\n");
+                MPI_Abort(MPI_COMM_WORLD, 1);
+            }
+            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);
             MPI_Win_wait(win);
 
-            for (i=0; i<SIZE1; i++) {
+            for (i = 0; i < SIZE1; i++) {
                 if (B[i] != i) {
-                    SQUELCH( printf("Put Error: B[i] is %d, should be %d\n", B[i], i); );
+                    SQUELCH(printf("Put Error: B[i] is %d, should be %d\n", B[i], i););
                     errs++;
                 }
             }
+#ifndef USE_WIN_ALLOCATE
+            MPI_Free_mem(B);
+#endif
         }
 
         MPI_Group_free(&group);
         MPI_Group_free(&comm_group);
         MPI_Win_free(&win);
         MPI_Free_mem(A);
-        MPI_Free_mem(B);
     }
 
     MPI_Comm_free(&CommDeuce);
     MTest_Finalize(errs);
     MPI_Finalize();
-    return 0; 
-} 
+    return 0;
+}