X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..d5b29830df70e823202e384a7655e4371193ecd7:/teshsuite/smpi/mpich3-test/datatype/simple-pack-external.c

diff --git a/teshsuite/smpi/mpich3-test/datatype/simple-pack-external.c b/teshsuite/smpi/mpich3-test/datatype/simple-pack-external.c
index 6465944ffd..73cce40c1a 100644
--- a/teshsuite/smpi/mpich3-test/datatype/simple-pack-external.c
+++ b/teshsuite/smpi/mpich3-test/datatype/simple-pack-external.c
@@ -29,31 +29,31 @@ int main(int argc, char **argv)
     parse_args(argc, argv);
 
     /* To improve reporting of problems about operations, we
-       change the error handler to errors return */
-    MPI_Comm_set_errhandler( MPI_COMM_WORLD, MPI_ERRORS_RETURN );
+     * change the error handler to errors return */
+    MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
 
     /* perform some tests */
     err = builtin_float_test();
-    if (err && verbose) fprintf(stderr, "%d errors in builtin float test.\n",
-				err);
+    if (err && verbose)
+        fprintf(stderr, "%d errors in builtin float test.\n", err);
     errs += err;
 
     err = vector_of_vectors_test();
-    if (err && verbose) fprintf(stderr,
-				"%d errors in vector of vectors test.\n", err);
+    if (err && verbose)
+        fprintf(stderr, "%d errors in vector of vectors test.\n", err);
     errs += err;
 
     err = optimizable_vector_of_basics_test();
-    if (err && verbose) fprintf(stderr,
-				"%d errors in vector of basics test.\n", err);
+    if (err && verbose)
+        fprintf(stderr, "%d errors in vector of basics test.\n", err);
     errs += err;
 
     err = struct_of_basics_test();
-    if (err && verbose) fprintf(stderr, 
-				"%d errors in struct of basics test.\n", err);
+    if (err && verbose)
+        fprintf(stderr, "%d errors in struct of basics test.\n", err);
     errs += err;
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }
@@ -68,15 +68,12 @@ int builtin_float_test(void)
 {
     int nints, nadds, ntypes, combiner;
 
-    int /* err, */ errs = 0;
+    int err, errs = 0;
+
+    err = MPI_Type_get_envelope(MPI_FLOAT, &nints, &nadds, &ntypes, &combiner);
 
-    /* err = */ MPI_Type_get_envelope(MPI_FLOAT,
-				&nints,
-				&nadds,
-				&ntypes,
-				&combiner);
-    
-    if (combiner != MPI_COMBINER_NAMED) errs++;
+    if (combiner != MPI_COMBINER_NAMED)
+        errs++;
 
     /* Note: it is erroneous to call MPI_Type_get_contents() on a basic. */
     return errs;
@@ -84,7 +81,7 @@ int builtin_float_test(void)
 
 /* vector_of_vectors_test()
  *
- * Builds a vector of a vector of ints.  Assuming an int array of size 9 
+ * Builds a vector of a vector of ints.  Assuming an int array of size 9
  * integers, and treating the array as a 3x3 2D array, this will grab the
  * corners.
  *
@@ -94,110 +91,94 @@ int vector_of_vectors_test(void)
 {
     MPI_Datatype inner_vector;
     MPI_Datatype outer_vector;
-    int array[9] = {  1, -1,  2,
-		     -2, -3, -4,
-		      3, -5,  4 };
+    int array[9] = { 1, -1, 2,
+        -2, -3, -4,
+        3, -5, 4
+    };
 
     char *buf;
     int i, err, errs = 0;
     MPI_Aint sizeoftype, position;
 
     /* set up type */
-    err = MPI_Type_vector(2,
-			  1,
-			  2,
-			  MPI_INT,
-			  &inner_vector);
+    err = MPI_Type_vector(2, 1, 2, MPI_INT, &inner_vector);
     if (err != MPI_SUCCESS) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "error in MPI call; aborting after %d errors\n",
-			     errs+1);
-	return errs;
+        errs++;
+        if (verbose)
+            fprintf(stderr, "error in MPI call; aborting after %d errors\n", errs + 1);
+        return errs;
     }
 
-    err = MPI_Type_vector(2,
-			  1,
-			  2,
-			  inner_vector,
-			  &outer_vector);
+    err = MPI_Type_vector(2, 1, 2, inner_vector, &outer_vector);
     if (err != MPI_SUCCESS) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "error in MPI call; aborting after %d errors\n",
-			     errs+1);
-	return errs;
+        errs++;
+        if (verbose)
+            fprintf(stderr, "error in MPI call; aborting after %d errors\n", errs + 1);
+        return errs;
     }
 
     MPI_Type_commit(&outer_vector);
 
-    MPI_Pack_external_size((char*)"external32", 1, outer_vector, &sizeoftype);
-    if (sizeoftype != 4*4) {
-	errs++;
-	if (verbose) fprintf(stderr, "size of type = %d; should be %d\n",
-			     (int) sizeoftype, 4*4);
-	return errs;
+    MPI_Pack_external_size((char *) "external32", 1, outer_vector, &sizeoftype);
+    if (sizeoftype != 4 * 4) {
+        errs++;
+        if (verbose)
+            fprintf(stderr, "size of type = %d; should be %d\n", (int) sizeoftype, 4 * 4);
+        return errs;
     }
 
     buf = (char *) malloc(sizeoftype);
 
     position = 0;
-    err = MPI_Pack_external((char*)"external32",
-			    array,
-			    1,
-			    outer_vector,
-			    buf,
-			    sizeoftype,
-			    &position);
+    err = MPI_Pack_external((char *) "external32",
+                            array, 1, outer_vector, buf, sizeoftype, &position);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, "position = %d; should be %d (pack)\n",
-			     (int) position, (int) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "position = %d; should be %d (pack)\n",
+                    (int) position, (int) sizeoftype);
     }
 
-    memset(array, 0, 9*sizeof(int));
+    memset(array, 0, 9 * sizeof(int));
     position = 0;
-    err = MPI_Unpack_external((char*)"external32",
-			      buf,
-			      sizeoftype,
-			      &position,
-			      array,
-			      1,
-			      outer_vector);
+    err = MPI_Unpack_external((char *) "external32",
+                              buf, sizeoftype, &position, array, 1, outer_vector);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, "position = %d; should be %d (unpack)\n",
-			     (int) position, (int) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "position = %d; should be %d (unpack)\n",
+                    (int) position, (int) sizeoftype);
     }
 
-    for (i=0; i < 9; i++) {
-	int goodval;
-	switch (i) {
-	    case 0:
-		goodval = 1;
-		break;
-	    case 2:
-		goodval = 2;
-		break;
-	    case 6:
-		goodval = 3;
-		break;
-	    case 8:
-		goodval = 4;
-		break;
-	    default:
-		goodval = 0;
-		break;
-	}
-	if (array[i] != goodval) {
-	    errs++;
-	    if (verbose) fprintf(stderr, "array[%d] = %d; should be %d\n",
-				 i, array[i], goodval);
-	}
+    for (i = 0; i < 9; i++) {
+        int goodval;
+        switch (i) {
+        case 0:
+            goodval = 1;
+            break;
+        case 2:
+            goodval = 2;
+            break;
+        case 6:
+            goodval = 3;
+            break;
+        case 8:
+            goodval = 4;
+            break;
+        default:
+            goodval = 0;
+            break;
+        }
+        if (array[i] != goodval) {
+            errs++;
+            if (verbose)
+                fprintf(stderr, "array[%d] = %d; should be %d\n", i, array[i], goodval);
+        }
     }
 
+    free(buf);
     MPI_Type_free(&inner_vector);
     MPI_Type_free(&outer_vector);
     return errs;
@@ -214,82 +195,71 @@ int optimizable_vector_of_basics_test(void)
 {
     MPI_Datatype parent_type;
     int array[20] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-		      16, 17, 18, 19 };
+        16, 17, 18, 19
+    };
     char *buf;
     int i;
     MPI_Aint sizeofint, sizeoftype, position;
 
-    int /* err, */ errs = 0;
+    int err, errs = 0;
 
-    MPI_Pack_external_size((char*)"external32", 1, MPI_INT, &sizeofint);
+    MPI_Pack_external_size((char *) "external32", 1, MPI_INT, &sizeofint);
 
     if (sizeofint != 4) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "size of external32 MPI_INT = %d; should be %d\n",
-			     (int) sizeofint, 4);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "size of external32 MPI_INT = %d; should be %d\n", (int) sizeofint, 4);
     }
 
     /* set up type */
-    /* err = */ MPI_Type_vector(10,
-			  2,
-			  2,
-			  MPI_INT,
-			  &parent_type);
+    err = MPI_Type_vector(10, 2, 2, MPI_INT, &parent_type);
 
     MPI_Type_commit(&parent_type);
 
-    MPI_Pack_external_size((char*)"external32", 1, parent_type, &sizeoftype);
+    MPI_Pack_external_size((char *) "external32", 1, parent_type, &sizeoftype);
 
 
     if (sizeoftype != 20 * sizeofint) {
-	errs++;
-	if (verbose) fprintf(stderr, "size of vector = %d; should be %d\n",
-			     (int) sizeoftype, (int) (20 * sizeofint));
+        errs++;
+        if (verbose)
+            fprintf(stderr, "size of vector = %d; should be %d\n",
+                    (int) sizeoftype, (int) (20 * sizeofint));
     }
 
     buf = (char *) malloc(sizeoftype);
 
     position = 0;
-    /* err = */ MPI_Pack_external((char*)"external32",
-			    array,
-			    1,
-			    parent_type,
-			    buf,
-			    sizeoftype,
-			    &position);
+    err = MPI_Pack_external((char *) "external32",
+                            array, 1, parent_type, buf, sizeoftype, &position);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, "position = %d; should be %d (pack)\n",
-			     (int) position, (int) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "position = %d; should be %d (pack)\n",
+                    (int) position, (int) sizeoftype);
     }
 
     memset(array, 0, 20 * sizeof(int));
     position = 0;
-    /* err = */ MPI_Unpack_external((char*)"external32",
-			      buf,
-			      sizeoftype,
-			      &position,
-			      array,
-			      1,
-			      parent_type);
+    err = MPI_Unpack_external((char *) "external32",
+                              buf, sizeoftype, &position, array, 1, parent_type);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "position = %ld; should be %ld (unpack)\n",
-			     (long) position, (long) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr,
+                    "position = %ld; should be %ld (unpack)\n", (long) position, (long) sizeoftype);
     }
 
-    for (i=0; i < 20; i++) {
-	if (array[i] != i) {
-	    errs++;
-	    if (verbose) fprintf(stderr, "array[%d] = %d; should be %d\n",
-				 i, array[i], i);
-	}
+    for (i = 0; i < 20; i++) {
+        if (array[i] != i) {
+            errs++;
+            if (verbose)
+                fprintf(stderr, "array[%d] = %d; should be %d\n", i, array[i], i);
+        }
     }
 
+    free(buf);
     MPI_Type_free(&parent_type);
     return errs;
 }
@@ -305,7 +275,8 @@ int struct_of_basics_test(void)
 {
     MPI_Datatype parent_type;
     int array[20] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-		      16, 17, 18, 19 };
+        16, 17, 18, 19
+    };
     char *buf;
     int i;
     MPI_Aint sizeofint, sizeoftype, position;
@@ -313,84 +284,72 @@ int struct_of_basics_test(void)
     MPI_Aint indices[10];
     MPI_Datatype types[10];
 
-    int /* err, */ errs = 0;
+    int err, errs = 0;
 
-    MPI_Pack_external_size((char*)"external32", 1, MPI_INT, &sizeofint);
+    MPI_Pack_external_size((char *) "external32", 1, MPI_INT, &sizeofint);
 
     if (sizeofint != 4) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "size of external32 MPI_INT = %d; should be %d\n",
-			     (int) sizeofint, 4);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "size of external32 MPI_INT = %d; should be %d\n", (int) sizeofint, 4);
     }
 
     for (i = 0; i < 10; i++) {
-	blocks[i] = 2;
-	indices[i] = 2 * i * sizeofint;
-	/* This will cause MPICH to consider this as a blockindex. We
-	 * need different types here. */
-	types[i] = MPI_INT;
+        blocks[i] = 2;
+        indices[i] = 2 * i * sizeofint;
+        /* This will cause MPICH to consider this as a blockindex. We
+         * need different types here. */
+        types[i] = MPI_INT;
     }
 
     /* set up type */
-    /* err = */ MPI_Type_struct(10,
-			  blocks,
-			  indices,
-			  types,
-			  &parent_type);
+    err = MPI_Type_struct(10, blocks, indices, types, &parent_type);
 
     MPI_Type_commit(&parent_type);
 
-    MPI_Pack_external_size((char*)"external32", 1, parent_type, &sizeoftype);
+    MPI_Pack_external_size((char *) "external32", 1, parent_type, &sizeoftype);
 
     if (sizeoftype != 20 * sizeofint) {
-	errs++;
-	if (verbose) fprintf(stderr, "size of vector = %d; should be %d\n",
-			     (int) sizeoftype, (int) (20 * sizeofint));
+        errs++;
+        if (verbose)
+            fprintf(stderr, "size of vector = %d; should be %d\n",
+                    (int) sizeoftype, (int) (20 * sizeofint));
     }
 
     buf = (char *) malloc(sizeoftype);
 
     position = 0;
-    /* err = */ MPI_Pack_external((char*)"external32",
-			    array,
-			    1,
-			    parent_type,
-			    buf,
-			    sizeoftype,
-			    &position);
+    err = MPI_Pack_external((char *) "external32",
+                            array, 1, parent_type, buf, sizeoftype, &position);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, "position = %d; should be %d (pack)\n",
-			     (int) position, (int) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr, "position = %d; should be %d (pack)\n",
+                    (int) position, (int) sizeoftype);
     }
 
     memset(array, 0, 20 * sizeof(int));
     position = 0;
-    /* err = */ MPI_Unpack_external((char*)"external32",
-			      buf,
-			      sizeoftype,
-			      &position,
-			      array,
-			      1,
-			      parent_type);
+    err = MPI_Unpack_external((char *) "external32",
+                              buf, sizeoftype, &position, array, 1, parent_type);
 
     if (position != sizeoftype) {
-	errs++;
-	if (verbose) fprintf(stderr, 
-			     "position = %ld; should be %ld (unpack)\n",
-			     (long) position, (long) sizeoftype);
+        errs++;
+        if (verbose)
+            fprintf(stderr,
+                    "position = %ld; should be %ld (unpack)\n", (long) position, (long) sizeoftype);
     }
 
-    for (i=0; i < 20; i++) {
-	if (array[i] != i) {
-	    errs++;
-	    if (verbose) fprintf(stderr, "array[%d] = %d; should be %d\n",
-				 i, array[i], i);
-	}
+    for (i = 0; i < 20; i++) {
+        if (array[i] != i) {
+            errs++;
+            if (verbose)
+                fprintf(stderr, "array[%d] = %d; should be %d\n", i, array[i], i);
+        }
     }
 
+    free(buf);
     MPI_Type_free(&parent_type);
     return errs;
 }
@@ -399,14 +358,12 @@ int parse_args(int argc, char **argv)
 {
     int ret;
 
-    while ((ret = getopt(argc, argv, "v")) >= 0)
-    {
-	switch (ret) {
-	    case 'v':
-		verbose = 1;
-		break;
-	}
+    while ((ret = getopt(argc, argv, "v")) >= 0) {
+        switch (ret) {
+        case 'v':
+            verbose = 1;
+            break;
+        }
     }
     return 0;
 }
-