X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c81c99a491282f76757c2673961e3cdee6853539..HEAD:/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
index b027f0b6d8..7492ecfcaf 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel2.c
@@ -12,72 +12,70 @@
 static char MTEST_Descrip[] = "Test of send cancel (failure) calls";
 */
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0;
     int rank, size, source, dest;
-    MPI_Comm      comm;
-    MPI_Status    status;
-    MPI_Request   req;
+    MPI_Comm comm;
+    MPI_Status status;
+    MPI_Request req;
     static int bufsizes[4] = { 1, 100, 10000, 1000000 };
     char *buf;
-    int  cs, flag, n;
+    int cs, flag, n;
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
 
     comm = MPI_COMM_WORLD;
-    MPI_Comm_rank( comm, &rank );
-    MPI_Comm_size( comm, &size );
+    MPI_Comm_rank(comm, &rank);
+    MPI_Comm_size(comm, &size);
 
     source = 0;
-    dest   = size - 1;
+    dest = size - 1;
 
-    MTestPrintfMsg( 1, "Starting scancel test\n" );
+    MTestPrintfMsg(1, "Starting scancel test\n");
 
-    for (cs=0; cs<4; cs++) {
-	n = bufsizes[cs];
-	buf = (char *)malloc( n );
-	if (!buf) {
-	    fprintf( stderr, "Unable to allocate %d bytes\n", n );
-	    MPI_Abort( MPI_COMM_WORLD, 1 );
-	}
+    for (cs = 0; cs < 4; cs++) {
+        n = bufsizes[cs];
+        buf = (char *) malloc(n);
+        MTEST_VG_MEM_INIT(buf, n);
+        if (!buf) {
+            fprintf(stderr, "Unable to allocate %d bytes\n", n);
+            MPI_Abort(MPI_COMM_WORLD, 1);
+        }
 
-	if (rank == source) {
-	    MTestPrintfMsg( 1, "(%d) About to create isend and cancel\n",cs );
-	    MPI_Isend( buf, n, MPI_CHAR, dest, cs+n+1, comm, &req );
-	    MPI_Barrier( comm );
-	    MPI_Cancel( &req );
-	    MPI_Wait( &req, &status );
-	    MTestPrintfMsg( 1, "Completed wait on isend\n" );
-	    MPI_Test_cancelled( &status, &flag );
-	    if (flag) {
-		errs ++;
-		printf( "Cancelled a matched Isend request (msg size = %d)!\n",
-			n );
-		fflush(stdout);
-	    }
-	    else
-	    {
-		n = 0;
-	    }
-	    /* Send the size, zero for not cancelled (success) */
-	    MPI_Send( &n, 1, MPI_INT, dest, 123, comm );
-	}
-	else if (rank == dest)
-	{
-	    MPI_Recv( buf, n, MPI_CHAR, source, cs+n+1, comm, &status );
-	    MPI_Barrier( comm );
-	    MPI_Recv( &n, 1, MPI_INT, source, 123, comm, &status );
-	}
-	else {
-	    MPI_Barrier( comm );
-	}
+        if (rank == source) {
+            MTestPrintfMsg(1, "(%d) About to create isend and cancel\n", cs);
+            MPI_Isend(buf, n, MPI_CHAR, dest, cs + n + 1, comm, &req);
+            MPI_Barrier(comm);
+            MPI_Cancel(&req);
+            MPI_Wait(&req, &status);
+            MTestPrintfMsg(1, "Completed wait on isend\n");
+            MPI_Test_cancelled(&status, &flag);
+            if (flag) {
+                errs++;
+                printf("Cancelled a matched Isend request (msg size = %d)!\n", n);
+                fflush(stdout);
+            }
+            else {
+                n = 0;
+            }
+            /* Send the size, zero for not cancelled (success) */
+            MPI_Send(&n, 1, MPI_INT, dest, 123, comm);
+        }
+        else if (rank == dest) {
+            MPI_Recv(buf, n, MPI_CHAR, source, cs + n + 1, comm, &status);
+            MPI_Barrier(comm);
+            MPI_Recv(&n, 1, MPI_INT, source, 123, comm, &status);
+        }
+        else {
+            MPI_Barrier(comm);
+        }
 
-	MPI_Barrier( comm );
-	free( buf );
+        MPI_Barrier(comm);
+        free(buf);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }