X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..c10a7a7c6fc2915d70478f351d4b817881262178:/src/smpi/colls/reduce_scatter-mpich.c

diff --git a/src/smpi/colls/reduce_scatter-mpich.c b/src/smpi/colls/reduce_scatter-mpich.c
index 76cbf0ffdd..11adf04c5d 100644
--- a/src/smpi/colls/reduce_scatter-mpich.c
+++ b/src/smpi/colls/reduce_scatter-mpich.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. */
+
 #include "colls_private.h"
 
 static inline int MPIU_Mirror_permutation(unsigned int x, int bits)
@@ -57,7 +63,7 @@ int smpi_coll_tuned_reduce_scatter_mpich_pair(void *sendbuf, void *recvbuf, int
         }
         
         /* allocate temporary buffer to store incoming data */
-        tmp_recvbuf = (void*)xbt_malloc(recvcounts[rank]*(max(true_extent,extent))+1);
+        tmp_recvbuf = (void*)smpi_get_tmp_recvbuffer(recvcounts[rank]*(MAX(true_extent,extent))+1);
         /* adjust for potential negative lower bound in datatype */
         tmp_recvbuf = (void *)((char*)tmp_recvbuf - true_lb);
         
@@ -136,7 +142,7 @@ int smpi_coll_tuned_reduce_scatter_mpich_pair(void *sendbuf, void *recvbuf, int
         }
     
         xbt_free(disps);
-        xbt_free(tmp_recvbuf);
+        smpi_free_tmp_buffer(tmp_recvbuf);
 
         return MPI_SUCCESS;
 }
@@ -180,8 +186,8 @@ int smpi_coll_tuned_reduce_scatter_mpich_noncomm(void *sendbuf, void *recvbuf, i
     block_size = recvcounts[0];
     total_count = block_size * comm_size;
 
-    tmp_buf0=( void *)xbt_malloc( true_extent * total_count);
-    tmp_buf1=( void *)xbt_malloc( true_extent * total_count);
+    tmp_buf0=( void *)smpi_get_tmp_sendbuffer( true_extent * total_count);
+    tmp_buf1=( void *)smpi_get_tmp_recvbuffer( true_extent * total_count);
     void *tmp_buf0_save=tmp_buf0;
     void *tmp_buf1_save=tmp_buf1;
 
@@ -252,8 +258,8 @@ int smpi_coll_tuned_reduce_scatter_mpich_noncomm(void *sendbuf, void *recvbuf, i
     result_ptr = (char *)(buf0_was_inout ? tmp_buf0 : tmp_buf1) + recv_offset * true_extent;
     mpi_errno = smpi_datatype_copy(result_ptr, size, datatype,
                                recvbuf, size, datatype);
-    xbt_free(tmp_buf0_save);
-    xbt_free(tmp_buf1_save);
+    smpi_free_tmp_buffer(tmp_buf0_save);
+    smpi_free_tmp_buffer(tmp_buf1_save);
     if (mpi_errno) return(mpi_errno);
     return MPI_SUCCESS;
 }
@@ -294,13 +300,13 @@ int smpi_coll_tuned_reduce_scatter_mpich_rdb(void *sendbuf, void *recvbuf, int r
             /* noncommutative and (non-pof2 or block irregular), use recursive doubling. */
 
             /* need to allocate temporary buffer to receive incoming data*/
-            tmp_recvbuf= (void *) xbt_malloc( total_count*(max(true_extent,extent)));
+            tmp_recvbuf= (void *) smpi_get_tmp_recvbuffer( total_count*(MAX(true_extent,extent)));
             /* adjust for potential negative lower bound in datatype */
             tmp_recvbuf = (void *)((char*)tmp_recvbuf - true_lb);
 
             /* need to allocate another temporary buffer to accumulate
                results */
-            tmp_results = (void *)xbt_malloc( total_count*(max(true_extent,extent)));
+            tmp_results = (void *)smpi_get_tmp_sendbuffer( total_count*(MAX(true_extent,extent)));
             /* adjust for potential negative lower bound in datatype */
             tmp_results = (void *)((char*)tmp_results - true_lb);
 
@@ -474,8 +480,8 @@ int smpi_coll_tuned_reduce_scatter_mpich_rdb(void *sendbuf, void *recvbuf, int r
                     }
                 }
 
-                smpi_datatype_free(&sendtype);
-                smpi_datatype_free(&recvtype);
+                smpi_datatype_unuse(sendtype);
+                smpi_datatype_unuse(recvtype);
 
                 mask <<= 1;
                 i++;
@@ -488,8 +494,8 @@ int smpi_coll_tuned_reduce_scatter_mpich_rdb(void *sendbuf, void *recvbuf, int r
             if (mpi_errno) return(mpi_errno);
 
     xbt_free(disps);
-    xbt_free(tmp_recvbuf);
-    xbt_free(tmp_results);
+    smpi_free_tmp_buffer(tmp_recvbuf);
+    smpi_free_tmp_buffer(tmp_results);
     return MPI_SUCCESS;
         }