Update copyright lines for 2022.

[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 3ce7918..5af3dd2 100644 (file)
--- a/src/smpi/colls/bcast/bcast-SMP-binary.cpp
+++ b/src/smpi/colls/bcast/bcast-SMP-binary.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team.
+/* Copyright (c) 2013-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,9 +9,9 @@
 int bcast_SMP_binary_segment_byte = 8192;
 namespace simgrid{
 namespace smpi{
-int Coll_bcast_SMP_binary::bcast(void *buf, int count,
-                                     MPI_Datatype datatype, int root,
-                                     MPI_Comm comm)
+int bcast__SMP_binary(void *buf, int count,
+                      MPI_Datatype datatype, int root,
+                      MPI_Comm comm)
 {
   int tag = COLL_TAG_BCAST;
   MPI_Status status;
@@ -31,8 +31,7 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
     host_num_core = comm->get_intra_comm()->size();
   }else{
     //implementation buggy in this case
-    return Coll_bcast_mpich::bcast( buf , count, datatype,
-              root, comm);
+    return bcast__mpich(buf , count, datatype, root, comm);
   }
 
   int segment = bcast_SMP_binary_segment_byte / extent;
@@ -121,8 +120,8 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
 
   // pipeline bcast
   else {
-    MPI_Request* request_array = new MPI_Request[size + pipe_length];
-    MPI_Status* status_array   = new MPI_Status[size + pipe_length];
+    auto* request_array = new MPI_Request[size + pipe_length];
+    auto* status_array  = new MPI_Status[size + pipe_length];
 
     // case ROOT-of-each-SMP
     if (rank % host_num_core == 0) {
@@ -215,11 +214,9 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count,
     delete[] status_array;
   }
 
-  // when count is not divisible by block size, use default BCAST for the remainder
   if ((remainder != 0) && (count > segment)) {
-    XBT_WARN("MPI_bcast_SMP_binary use default MPI_bcast.");
-    Colls::bcast((char *) buf + (pipe_length * increment), remainder, datatype,
-              root, comm);
+    XBT_INFO("MPI_bcast_SMP_binary: count is not divisible by block size, use default MPI_bcast for remainer.");
+    colls::bcast((char*)buf + (pipe_length * increment), remainder, datatype, root, comm);
   }
 
   return 1;