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

diff --git a/src/smpi/colls/reduce_scatter-ompi.c b/src/smpi/colls/reduce_scatter-ompi.c
index f8c716f2d0..bd2d578912 100644
--- a/src/smpi/colls/reduce_scatter-ompi.c
+++ b/src/smpi/colls/reduce_scatter-ompi.c
@@ -23,6 +23,7 @@
 
 #include "colls_private.h"
 #include "coll_tuned_topo.h"
+#include "xbt/replay.h"
 
 /*
  * Recursive-halving function is (*mostly*) copied from the BASIC coll module.
@@ -61,6 +62,8 @@ smpi_coll_tuned_reduce_scatter_ompi_basic_recursivehalving(void *sbuf,
     size = smpi_comm_size(comm);
    
     XBT_DEBUG("coll:tuned:reduce_scatter_ompi_basic_recursivehalving, rank %d", rank);
+    if(!smpi_op_is_commute(op))
+      THROWF(arg_error,0, " reduce_scatter ompi_basic_recursivehalving can only be used for commutative operations! ");
 
     /* Find displacements and the like */
     disps = (int*) xbt_malloc(sizeof(int) * size);
@@ -89,7 +92,11 @@ smpi_coll_tuned_reduce_scatter_ompi_basic_recursivehalving(void *sbuf,
     }
 
     /* Allocate temporary receive buffer. */
-    recv_buf_free = (char*) xbt_malloc(buf_size);
+    if(_xbt_replay_is_active()){
+      recv_buf_free = (char*) SMPI_SHARED_MALLOC(buf_size);
+    }else{
+      recv_buf_free = (char*) xbt_malloc(buf_size);
+    }
     recv_buf = recv_buf_free - lb;
     if (NULL == recv_buf_free) {
         err = MPI_ERR_OTHER;
@@ -97,7 +104,11 @@ smpi_coll_tuned_reduce_scatter_ompi_basic_recursivehalving(void *sbuf,
     }
    
     /* allocate temporary buffer for results */
-    result_buf_free = (char*) xbt_malloc(buf_size);
+    if(_xbt_replay_is_active()){
+      result_buf_free = (char*) SMPI_SHARED_MALLOC(buf_size);
+    }else{
+      result_buf_free = (char*) xbt_malloc(buf_size);
+    }
     result_buf = result_buf_free - lb;
    
     /* copy local buffer into the temporary results */
@@ -287,9 +298,14 @@ smpi_coll_tuned_reduce_scatter_ompi_basic_recursivehalving(void *sbuf,
 
  cleanup:
     if (NULL != disps) xbt_free(disps);
-    if (NULL != recv_buf_free) xbt_free(recv_buf_free);
-    if (NULL != result_buf_free) xbt_free(result_buf_free);
-
+    
+    if (!_xbt_replay_is_active()){
+      if (NULL != recv_buf_free) xbt_free(recv_buf_free);
+      if (NULL != result_buf_free) xbt_free(result_buf_free);
+    }else{
+      if (NULL != recv_buf_free) SMPI_SHARED_FREE(recv_buf_free);
+      if (NULL != result_buf_free) SMPI_SHARED_FREE(result_buf_free);
+    }
     return err;
 }