X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..954676b700e711f38ec4d286d33d5427d3f4ca46:/src/smpi/colls/scatter-ompi.c

diff --git a/src/smpi/colls/scatter-ompi.c b/src/smpi/colls/scatter-ompi.c
index c65b6f9511..9eace67529 100644
--- a/src/smpi/colls/scatter-ompi.c
+++ b/src/smpi/colls/scatter-ompi.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,11 +15,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * $COPYRIGHT$
  *
  * Additional copyrights may follow
- *
- * $HEADER$
  */
 
 
@@ -74,7 +77,7 @@ smpi_coll_tuned_scatter_ompi_binomial(void *sbuf, int scount,
 	    }
 	} else {
 	    /* root is not on 0, allocate temp buffer for send */
-	    tempbuf = (char *) malloc(strue_extent + (scount*size - 1) * sextent);
+	    tempbuf = (char *) smpi_get_tmp_sendbuffer(strue_extent + (scount*size - 1) * sextent);
 	    if (NULL == tempbuf) {
 		err = MPI_ERR_OTHER; line = __LINE__; goto err_hndl;
 	    }
@@ -102,7 +105,7 @@ smpi_coll_tuned_scatter_ompi_binomial(void *sbuf, int scount,
     } else if (!(vrank % 2)) {
 	/* non-root, non-leaf nodes, allocate temp buffer for recv
 	 * the most we need is rcount*size/2 */
-	tempbuf = (char *) malloc(rtrue_extent + (rcount*size - 1) * rextent);
+	tempbuf = (char *) smpi_get_tmp_recvbuffer(rtrue_extent + (rcount*size - 1) * rextent);
 	if (NULL == tempbuf) {
 	    err= MPI_ERR_OTHER; line = __LINE__; goto err_hndl;
 	}
@@ -124,8 +127,7 @@ smpi_coll_tuned_scatter_ompi_binomial(void *sbuf, int scount,
 	    smpi_mpi_recv(ptmp, rcount*size, rdtype, bmtree->tree_prev,
 				    COLL_TAG_SCATTER, comm, &status);
 	    /* local copy to rbuf */
-	    err = smpi_datatype_copy(ptmp, scount, sdtype,
-				  rbuf, rcount, rdtype);
+	    smpi_datatype_copy(ptmp, scount, sdtype, rbuf, rcount, rdtype);
 	}
 	/* send to children on all non-leaf */
 	for (i = 0; i < bmtree->tree_nextsize; i++) {
@@ -145,13 +147,15 @@ smpi_coll_tuned_scatter_ompi_binomial(void *sbuf, int scount,
 	    total_send += mycount;
 	}
 
-	if (NULL != tempbuf) 
-	    free(tempbuf);
+
     } else {
 	/* recv from parent on leaf nodes */
 	smpi_mpi_recv(ptmp, rcount, rdtype, bmtree->tree_prev,
 				COLL_TAG_SCATTER, comm, &status);
     }
+
+    if (NULL != tempbuf)
+      smpi_free_tmp_buffer(tempbuf);
     //!FIXME : store the tree, as done in ompi, instead of calculating it each time ?
     xbt_free(bmtree);