Merge branch 'tracemgrsplit' into 'master'

[simgrid.git] / src / smpi / colls / bcast / bcast-SMP-binary.cpp

diff --git a/src/smpi/colls/bcast/bcast-SMP-binary.cpp b/src/smpi/colls/bcast/bcast-SMP-binary.cpp
index 801889e..3ce7918 100644 (file)
--- a/src/smpi/colls/bcast/bcast-SMP-binary.cpp
+++ b/src/smpi/colls/bcast/bcast-SMP-binary.cpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2019. 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"
-
+#include "../colls_private.hpp"
 
 int bcast_SMP_binary_segment_byte = 8192;
 namespace simgrid{
@@ -17,8 +16,6 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
   int tag = COLL_TAG_BCAST;
   MPI_Status status;
   MPI_Request request;
-  MPI_Request *request_array;
-  MPI_Status *status_array;
   int rank, size;
   int i;
   MPI_Aint extent;
@@ -62,7 +59,7 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
     else if (rank == 0)
       Request::recv(buf, count, datatype, root, tag, comm, &status);
   }
-  // when a message is smaller than a block size => no pipeline 
+  // when a message is smaller than a block size => no pipeline
   if (count <= segment) {
     // case ROOT-of-each-SMP
     if (rank % host_num_core == 0) {
@@ -124,10 +121,8 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
 
   // pipeline bcast
   else {
-    request_array =
-        (MPI_Request *) xbt_malloc((size + pipe_length) * sizeof(MPI_Request));
-    status_array =
-        (MPI_Status *) xbt_malloc((size + pipe_length) * sizeof(MPI_Status));
+    MPI_Request* request_array = new MPI_Request[size + pipe_length];
+    MPI_Status* status_array   = new MPI_Status[size + pipe_length];
 
     // case ROOT-of-each-SMP
     if (rank % host_num_core == 0) {
@@ -216,8 +211,8 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
       }
     }
 
-    free(request_array);
-    free(status_array);
+    delete[] request_array;
+    delete[] status_array;
   }
 
   // when count is not divisible by block size, use default BCAST for the remainder