Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield

[simgrid.git] / src / smpi / colls / bcast / bcast-flattree-pipeline.cpp

diff --git a/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp b/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
index bac37d2..db597a5 100644 (file)
--- a/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
+++ b/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
@@ -1,15 +1,16 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2017. 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 flattree_segment_in_byte = 8192;
-
+namespace simgrid{
+namespace smpi{
 int
-smpi_coll_tuned_bcast_flattree_pipeline(void *buff, int count,
+Coll_bcast_flattree_pipeline::bcast(void *buff, int count,
                                         MPI_Datatype data_type, int root,
                                         MPI_Comm comm)
 {
@@ -20,12 +21,12 @@ smpi_coll_tuned_bcast_flattree_pipeline(void *buff, int count,
   extent = data_type->get_extent();
 
   int segment = flattree_segment_in_byte / extent;
-  segment =  segment == 0 ? 1 :segment; 
+  segment =  segment == 0 ? 1 :segment;
   int pipe_length = count / segment;
   int increment = segment * extent;
   if (pipe_length==0) {
     XBT_WARN("MPI_bcast_flattree_pipeline use default MPI_bcast_flattree.");
-    return smpi_coll_tuned_bcast_flattree(buff, count, data_type, root, comm);
+    return Coll_bcast_flattree::bcast(buff, count, data_type, root, comm);
   }
   rank = comm->rank();
   num_procs = comm->size();
@@ -61,3 +62,6 @@ smpi_coll_tuned_bcast_flattree_pipeline(void *buff, int count,
   free(status_array);
   return MPI_SUCCESS;
 }
+
+}
+}