X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aac4ba41ea27fe8168bebed009abebd7e5c3f006..4cdc0f888550cbaefe6094ae801230336d005337:/teshsuite/smpi/mpich3-test/rma/accfence1.c

diff --git a/teshsuite/smpi/mpich3-test/rma/accfence1.c b/teshsuite/smpi/mpich3-test/rma/accfence1.c
index 91d9f439cb..f4b8930d6b 100644
--- a/teshsuite/smpi/mpich3-test/rma/accfence1.c
+++ b/teshsuite/smpi/mpich3-test/rma/accfence1.c
@@ -12,92 +12,93 @@
 static char MTEST_Descrip[] = "Accumulate/Replace with Fence";
 */
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0, err;
     int rank, size, source, dest;
-    int minsize = 2, count; 
-    MPI_Comm      comm;
-    MPI_Win       win;
-    MPI_Aint      extent;
+    int minsize = 2, count;
+    MPI_Comm comm;
+    MPI_Win win;
+    MPI_Aint extent, lb;
     MTestDatatype sendtype, recvtype;
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
 
-    /* The following illustrates the use of the routines to 
-       run through a selection of communicators and datatypes.
-       Use subsets of these for tests that do not involve combinations 
-       of communicators, datatypes, and counts of datatypes */
-    while (MTestGetIntracommGeneral( &comm, minsize, 1 )) {
-	if (comm == MPI_COMM_NULL) continue;
-	/* Determine the sender and receiver */
-	MPI_Comm_rank( comm, &rank );
-	MPI_Comm_size( comm, &size );
-	source = 0;
-	dest   = size - 1;
-	
-	for (count = 1; count < 65000; count = count * 2) {
-	    while (MTestGetDatatypes( &sendtype, &recvtype, count )) {
-		/* Make sure that everyone has a recv buffer */
-		recvtype.InitBuf( &recvtype );
+    /* The following illustrates the use of the routines to
+     * run through a selection of communicators and datatypes.
+     * Use subsets of these for tests that do not involve combinations
+     * of communicators, datatypes, and counts of datatypes */
+    while (MTestGetIntracommGeneral(&comm, minsize, 1)) {
+        if (comm == MPI_COMM_NULL)
+            continue;
+        /* Determine the sender and receiver */
+        MPI_Comm_rank(comm, &rank);
+        MPI_Comm_size(comm, &size);
+        source = 0;
+        dest = size - 1;
 
-		MPI_Type_extent( recvtype.datatype, &extent );
-		MPI_Win_create( recvtype.buf, recvtype.count * extent, 
-				(int)extent, MPI_INFO_NULL, comm, &win );
-		MPI_Win_fence( 0, win );
-		if (rank == source) {
-		    sendtype.InitBuf( &sendtype );
+        MTEST_DATATYPE_FOR_EACH_COUNT(count) {
+            while (MTestGetDatatypes(&sendtype, &recvtype, count)) {
+                /* Make sure that everyone has a recv buffer */
+                recvtype.InitBuf(&recvtype);
 
-		    /* To improve reporting of problems about operations, we
-		       change the error handler to errors return */
-		    MPI_Win_set_errhandler( win, MPI_ERRORS_RETURN );
-		    
-		    /* MPI_REPLACE on accumulate is almost the same 
-		       as MPI_Put; the only difference is in the
-		       handling of overlapping accumulate operations,
-		       which are not tested here */
-		    err = MPI_Accumulate( sendtype.buf, sendtype.count, 
-					  sendtype.datatype, dest, 0, 
-					  recvtype.count, recvtype.datatype, 
-					  MPI_REPLACE, win );
-		    if (err) {
-			errs++;
-			if (errs < 10) {
-			    printf( "Accumulate types: send %s, recv %s\n",
-				    MTestGetDatatypeName( &sendtype ),
-				    MTestGetDatatypeName( &recvtype ) );
-			    MTestPrintError( err );
-			}
-		    }
-		    err = MPI_Win_fence( 0, win );
-		    if (err) {
-			errs++;
-			if (errs < 10) {
-			    MTestPrintError( err );
-			}
-		    }
-		}
-		else if (rank == dest) {
-		    MPI_Win_fence( 0, win );
-		    /* This should have the same effect, in terms of
-		       transfering data, as a send/recv pair */
-		    err = MTestCheckRecv( 0, &recvtype );
-		    if (err) {
-			errs += err;
-		    }
-		}
-		else {
-		    MPI_Win_fence( 0, win );
-		}
-		MPI_Win_free( &win );
-		MTestFreeDatatype( &sendtype );
-		MTestFreeDatatype( &recvtype );
-	    }
-	}
+                MPI_Type_extent(recvtype.datatype, &extent);
+                MPI_Type_lb(recvtype.datatype, &lb);
+                MPI_Win_create(recvtype.buf, recvtype.count * extent + lb,
+                               (int) extent, MPI_INFO_NULL, comm, &win);
+                MPI_Win_fence(0, win);
+                if (rank == source) {
+                    sendtype.InitBuf(&sendtype);
+
+                    /* To improve reporting of problems about operations, we
+                     * change the error handler to errors return */
+                    MPI_Win_set_errhandler(win, MPI_ERRORS_RETURN);
+
+                    /* MPI_REPLACE on accumulate is almost the same
+                     * as MPI_Put; the only difference is in the
+                     * handling of overlapping accumulate operations,
+                     * which are not tested here */
+                    err = MPI_Accumulate(sendtype.buf, sendtype.count,
+                                         sendtype.datatype, dest, 0,
+                                         recvtype.count, recvtype.datatype, MPI_REPLACE, win);
+                    if (err) {
+                        errs++;
+                        if (errs < 10) {
+                            printf("Accumulate types: send %s, recv %s\n",
+                                   MTestGetDatatypeName(&sendtype),
+                                   MTestGetDatatypeName(&recvtype));
+                            MTestPrintError(err);
+                        }
+                    }
+                    err = MPI_Win_fence(0, win);
+                    if (err) {
+                        errs++;
+                        if (errs < 10) {
+                            MTestPrintError(err);
+                        }
+                    }
+                }
+                else if (rank == dest) {
+                    MPI_Win_fence(0, win);
+                    /* This should have the same effect, in terms of
+                     * transfering data, as a send/recv pair */
+                    err = MTestCheckRecv(0, &recvtype);
+                    if (err) {
+                        errs += err;
+                    }
+                }
+                else {
+                    MPI_Win_fence(0, win);
+                }
+                MPI_Win_free(&win);
+                MTestFreeDatatype(&sendtype);
+                MTestFreeDatatype(&recvtype);
+            }
+        }
         MTestFreeComm(&comm);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }