X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f35db13138682b1be530a509d1eeadeafff84ca7..ea74f5d95928a521a588737e81f1de94eef25d19:/src/smpi/colls/bcast/bcast-arrival-scatter.cpp

diff --git a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
index 76905f41d1..78fb73965a 100644
--- a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
+++ b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2014. 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
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "../colls_private.h"
+#include "../colls_private.hpp"
 
 #ifndef BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE
 #define BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE 128
@@ -16,12 +16,12 @@
 namespace simgrid{
 namespace smpi{
 /* Non-topology-specific pipelined linear-bcast function */
-int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
-                                          MPI_Datatype datatype, int root,
-                                          MPI_Comm comm)
+int bcast__arrival_scatter(void *buf, int count,
+                           MPI_Datatype datatype, int root,
+                           MPI_Comm comm)
 {
   int tag = -COLL_TAG_BCAST;//in order to use ANY_TAG, make this one positive
-  int header_tag = 10;
+  int header_tag = -10;
   MPI_Status status;
 
   int curr_remainder;
@@ -59,9 +59,9 @@ int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
 
   /* message too small */
   if (count < size) {
-    XBT_WARN("MPI_bcast_arrival_scatter use default MPI_bcast.");
-    Colls::bcast(buf, count, datatype, root, comm);
-    return MPI_SUCCESS;        
+    XBT_INFO("MPI_bcast_arrival_scatter: count < size, use default MPI_bcast.");
+    colls::bcast(buf, count, datatype, root, comm);
+    return MPI_SUCCESS;
   }
 
 
@@ -193,7 +193,7 @@ int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
              0, tag, comm, &status);
 
     /* at this point all nodes in this set perform all-gather operation */
-    
+
     to = (myordering == (total_nodes - 1)) ? header_buf[0] : header_buf[myordering + 1];
     from = (myordering == 0) ? header_buf[total_nodes - 1] : header_buf[myordering - 1];