X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/smpi/colls/bcast/bcast-SMP-linear.cpp diff --git a/src/smpi/colls/bcast/bcast-SMP-linear.cpp b/src/smpi/colls/bcast/bcast-SMP-linear.cpp index 29d24a1947..a884aae28e 100644 --- a/src/smpi/colls/bcast/bcast-SMP-linear.cpp +++ b/src/smpi/colls/bcast/bcast-SMP-linear.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. +/* Copyright (c) 2013-2018. 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_linear_segment_byte = 8192; namespace simgrid{ @@ -38,7 +38,7 @@ int Coll_bcast_SMP_linear::bcast(void *buf, int count, } int segment = bcast_SMP_linear_segment_byte / extent; - segment = segment == 0 ? 1 :segment; + segment = segment == 0 ? 1 :segment; int pipe_length = count / segment; int remainder = count % segment; int increment = segment * extent; @@ -53,9 +53,9 @@ int Coll_bcast_SMP_linear::bcast(void *buf, int count, // call native when MPI communication size is too small if (size <= num_core) { - XBT_WARN("MPI_bcast_SMP_linear use default MPI_bcast."); + XBT_WARN("MPI_bcast_SMP_linear use default MPI_bcast."); Coll_bcast_default::bcast(buf, count, datatype, root, comm); - return MPI_SUCCESS; + return MPI_SUCCESS; } // if root is not zero send to rank zero first if (root != 0) { @@ -64,7 +64,7 @@ int Coll_bcast_SMP_linear::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 if (rank == 0) { @@ -170,7 +170,7 @@ int Coll_bcast_SMP_linear::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_linear use default MPI_bcast."); + XBT_WARN("MPI_bcast_SMP_linear use default MPI_bcast."); Colls::bcast((char *) buf + (pipe_length * increment), remainder, datatype, root, comm); }