X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..8dd3206354d72d10fed1f3df1cf834573d9c0d9d:/src/smpi/colls/bcast/bcast-NTSB.cpp

diff --git a/src/smpi/colls/bcast/bcast-NTSB.cpp b/src/smpi/colls/bcast/bcast-NTSB.cpp
index 3055371940..8c81b027d5 100644
--- a/src/smpi/colls/bcast/bcast-NTSB.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSB.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,19 +9,14 @@
 int bcast_NTSB_segment_size_in_byte = 8192;
 namespace simgrid{
 namespace smpi{
-int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
-                               int root, MPI_Comm comm)
+int bcast__NTSB(void *buf, int count, MPI_Datatype datatype,
+                int root, MPI_Comm comm)
 {
   int tag = COLL_TAG_BCAST;
   MPI_Status status;
   int rank, size;
   int i;
 
-  MPI_Request *send_request_array;
-  MPI_Request *recv_request_array;
-  MPI_Status *send_status_array;
-  MPI_Status *recv_status_array;
-
   MPI_Aint extent;
   extent = datatype->get_extent();
 
@@ -80,13 +75,13 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::recv(buf, count, datatype, from, tag, comm, &status);
     }
 
-    /* case: intermidiate node with only left child ==> relay message */
+    /* case: intermediate node with only left child ==> relay message */
     else if (to_right == -1) {
       Request::recv(buf, count, datatype, from, tag, comm, &status);
       Request::send(buf, count, datatype, to_left, tag, comm);
     }
 
-    /* case: intermidiate node with both left and right children ==> relay message */
+    /* case: intermediate node with both left and right children ==> relay message */
     else {
       Request::recv(buf, count, datatype, from, tag, comm, &status);
       Request::send(buf, count, datatype, to_left, tag, comm);
@@ -97,16 +92,10 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
   // pipelining
   else {
 
-    send_request_array =
-        (MPI_Request *) xbt_malloc(2 * (size + pipe_length) * sizeof(MPI_Request));
-    recv_request_array =
-        (MPI_Request *) xbt_malloc((size + pipe_length) * sizeof(MPI_Request));
-    send_status_array =
-        (MPI_Status *) xbt_malloc(2 * (size + pipe_length) * sizeof(MPI_Status));
-    recv_status_array =
-        (MPI_Status *) xbt_malloc((size + pipe_length) * sizeof(MPI_Status));
-
-
+    auto* send_request_array = new MPI_Request[2 * (size + pipe_length)];
+    auto* recv_request_array = new MPI_Request[size + pipe_length];
+    auto* send_status_array  = new MPI_Status[2 * (size + pipe_length)];
+    auto* recv_status_array  = new MPI_Status[size + pipe_length];
 
     /* case: root */
     if (rank == 0) {
@@ -139,7 +128,7 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::waitall((pipe_length), recv_request_array, recv_status_array);
     }
 
-    /* case: intermidiate node with only left child ==> relay message */
+    /* case: intermediate node with only left child ==> relay message */
     else if (to_right == -1) {
       for (i = 0; i < pipe_length; i++) {
         recv_request_array[i] = Request::irecv((char *) buf + (i * increment), segment, datatype, from,
@@ -153,7 +142,7 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::waitall(pipe_length, send_request_array, send_status_array);
 
     }
-    /* case: intermidiate node with both left and right children ==> relay message */
+    /* case: intermediate node with both left and right children ==> relay message */
     else {
       for (i = 0; i < pipe_length; i++) {
         recv_request_array[i] = Request::irecv((char *) buf + (i * increment), segment, datatype, from,
@@ -169,17 +158,15 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::waitall((2 * pipe_length), send_request_array, send_status_array);
     }
 
-    free(send_request_array);
-    free(recv_request_array);
-    free(send_status_array);
-    free(recv_status_array);
+    delete[] send_request_array;
+    delete[] recv_request_array;
+    delete[] send_status_array;
+    delete[] recv_status_array;
   }                             /* end pipeline */
 
-  /* when count is not divisible by block size, use default BCAST for the remainder */
   if ((remainder != 0) && (count > segment)) {
-    XBT_WARN("MPI_bcast_NTSB use default MPI_bcast.");
-    Colls::bcast((char *) buf + (pipe_length * increment), remainder, datatype,
-              root, comm);
+    XBT_INFO("MPI_bcast_NTSB: count is not divisible by block size, use default MPI_bcast for remainder.");
+    colls::bcast((char*)buf + (pipe_length * increment), remainder, datatype, root, comm);
   }
 
   return MPI_SUCCESS;