X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7ed19dfcc221d7b3eca182abb5c4a3946671172..1fc042e8bc9c51f9267fa1936deaebe59ae01ee7:/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 02971613fd..bcec2292a4 100644 --- a/src/smpi/colls/bcast/bcast-SMP-binary.cpp +++ b/src/smpi/colls/bcast/bcast-SMP-binary.cpp @@ -1,14 +1,14 @@ -/* 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 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) @@ -61,7 +61,7 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count, else if (rank == 0) Request::recv(buf, count, datatype, root, tag, comm, &status); } - // when a message is smaller than a block size => no pipeline + // when a message is smaller than a block size => no pipeline if (count <= segment) { // case ROOT-of-each-SMP if (rank % host_num_core == 0) { @@ -221,10 +221,13 @@ int Coll_bcast_SMP_binary::bcast(void *buf, int count, // 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."); + XBT_WARN("MPI_bcast_SMP_binary use default MPI_bcast."); Colls::bcast((char *) buf + (pipe_length * increment), remainder, datatype, root, comm); } return 1; } + +} +}