leaks -- with smp algos

[simgrid.git] / src / smpi / colls / bcast-flattree-pipeline.c

diff --git a/src/smpi/colls/bcast-flattree-pipeline.c b/src/smpi/colls/bcast-flattree-pipeline.c
index 5212032..9b94eb2 100644 (file)
--- a/src/smpi/colls/bcast-flattree-pipeline.c
+++ b/src/smpi/colls/bcast-flattree-pipeline.c
@@ -1,4 +1,10 @@
-#include "colls.h"
+/* 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"
 
 int flattree_segment_in_byte = 8192;
 
@@ -8,30 +14,33 @@ smpi_coll_tuned_bcast_flattree_pipeline(void *buff, int count,
                                         MPI_Comm comm)
 {
   int i, j, rank, num_procs;
-  int tag = 1;
+  int tag = COLL_TAG_BCAST;
 
   MPI_Aint extent;
-  MPI_Type_extent(data_type, &extent);
+  extent = smpi_datatype_get_extent(data_type);
 
   int segment = flattree_segment_in_byte / extent;
+  segment =  segment == 0 ? 1 :segment; 
   int pipe_length = count / segment;
   int increment = segment * extent;
-
-  MPI_Comm_rank(comm, &rank);
-  MPI_Comm_size(comm, &num_procs);
+  if (pipe_length==0) {
+    XBT_WARN("MPI_bcast_flattree_pipeline use default MPI_bcast_flattree.");
+    return smpi_coll_tuned_bcast_flattree(buff, count, data_type, root, comm);
+  }
+  rank = smpi_comm_rank(comm);
+  num_procs = smpi_comm_size(comm);
 
   MPI_Request *request_array;
   MPI_Status *status_array;
 
-  request_array = (MPI_Request *) malloc(pipe_length * sizeof(MPI_Request));
-  status_array = (MPI_Status *) malloc(pipe_length * sizeof(MPI_Status));
+  request_array = (MPI_Request *) xbt_malloc(pipe_length * sizeof(MPI_Request));
+  status_array = (MPI_Status *) xbt_malloc(pipe_length * sizeof(MPI_Status));
 
   if (rank != root) {
     for (i = 0; i < pipe_length; i++) {
-      MPI_Irecv((char *)buff + (i * increment), segment, data_type, root, tag, comm,
-                &request_array[i]);
+      request_array[i] = smpi_mpi_irecv((char *)buff + (i * increment), segment, data_type, root, tag, comm);
     }
-    MPI_Waitall(pipe_length, request_array, status_array);
+    smpi_mpi_waitall(pipe_length, request_array, status_array);
   }
 
   else {
@@ -41,7 +50,7 @@ smpi_coll_tuned_bcast_flattree_pipeline(void *buff, int count,
         continue;
       else {
         for (i = 0; i < pipe_length; i++) {
-          MPI_Send((char *)buff + (i * increment), segment, data_type, j, tag, comm);
+          smpi_mpi_send((char *)buff + (i * increment), segment, data_type, j, tag, comm);
         }
       }
     }