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

diff --git a/src/smpi/colls/scatter-ompi.c b/src/smpi/colls/scatter-ompi.c
index 130ec40932..9eace67529 100644
--- a/src/smpi/colls/scatter-ompi.c
+++ b/src/smpi/colls/scatter-ompi.c
@@ -77,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;
 	    }
@@ -105,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;
 	}
@@ -127,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++) {
@@ -156,7 +155,7 @@ smpi_coll_tuned_scatter_ompi_binomial(void *sbuf, int scount,
     }
 
     if (NULL != tempbuf)
-      free(tempbuf);
+      smpi_free_tmp_buffer(tempbuf);
     //!FIXME : store the tree, as done in ompi, instead of calculating it each time ?
     xbt_free(bmtree);