Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / colls / bcast-mvapich-smp.c

diff --git a/src/smpi/colls/bcast-mvapich-smp.c b/src/smpi/colls/bcast-mvapich-smp.c
index 8fb512c..5202177 100644 (file)
--- a/src/smpi/colls/bcast-mvapich-smp.c
+++ b/src/smpi/colls/bcast-mvapich-smp.c
@@ -238,7 +238,8 @@ int smpi_coll_tuned_bcast_mvapich2_knomial_intra_node(void *buffer,
             mask /= mv2_intra_node_knomial_factor;
         }
     }
-
+    xbt_free(reqarray);
+    xbt_free(starray);
     return mpi_errno;
 }
 
@@ -296,7 +297,8 @@ int smpi_coll_tuned_bcast_mvapich2_intra_node(void *buffer,
      */
     //if (is_homogeneous) {
         type_size=smpi_datatype_size(datatype);
-    //} /*else {*/
+    //}
+/*    else {*/
 /*        MPIR_Pack_size_impl(1, datatype, &type_size);*/
 /*    }*/
     nbytes = (size_t) (count) * (type_size);
@@ -315,7 +317,7 @@ int smpi_coll_tuned_bcast_mvapich2_intra_node(void *buffer,
         ) {
 
         if (!is_contig || !is_homogeneous) {
-            tmp_buf=(void *)xbt_malloc(nbytes);
+            tmp_buf=(void *)smpi_get_tmp_sendbuffer(nbytes);
 
             /* TODO: Pipeline the packing and communication */
            // position = 0;