Properly register the waiter in wait_any_for(), so that it gets handled on suspend...

[simgrid.git] / 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 d30b8b1d87d52ce08d248b9897cd5873d39286f6..304c0dbb7391a241c38269c35ca4fa3be94862c9 100644 (file)
--- a/src/smpi/colls/bcast/bcast-NTSB.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSB.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2020. The SimGrid Team.
+/* Copyright (c) 2013-2023. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,8 +7,7 @@
 #include "../colls_private.hpp"
 
 int bcast_NTSB_segment_size_in_byte = 8192;
-namespace simgrid{
-namespace smpi{
+namespace simgrid::smpi {
 int bcast__NTSB(void *buf, int count, MPI_Datatype datatype,
                 int root, MPI_Comm comm)
 {
@@ -92,10 +91,10 @@ int bcast__NTSB(void *buf, int count, MPI_Datatype datatype,
   // pipelining
   else {
 
-    MPI_Request* send_request_array = new MPI_Request[2 * (size + pipe_length)];
-    MPI_Request* recv_request_array = new MPI_Request[size + pipe_length];
-    MPI_Status* send_status_array   = new MPI_Status[2 * (size + pipe_length)];
-    MPI_Status* recv_status_array   = new MPI_Status[size + pipe_length];
+    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) {
@@ -164,14 +163,12 @@ int bcast__NTSB(void *buf, int count, MPI_Datatype datatype,
     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.");
+    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;
 }
 
-}
-}
+} // namespace simgrid::smpi