X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efa1f86e31adca3c57e9d0135b2f6ebdbabb0878..HEAD:/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp diff --git a/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp index 6d331df2ab..445596b8ce 100644 --- a/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp +++ b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. +/* Copyright (c) 2013-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,8 +15,7 @@ int bcast_arrival_pattern_aware_wait_segment_size_in_byte = 8192; #ifndef BCAST_ARRIVAL_PATTERN_AWARE_MAX_NODE #define BCAST_ARRIVAL_PATTERN_AWARE_MAX_NODE 128 #endif -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { /* Non-topology-specific pipelined linear-bcast function */ int bcast__arrival_pattern_aware_wait(void *buf, int count, MPI_Datatype datatype, @@ -93,21 +92,18 @@ int bcast__arrival_pattern_aware_wait(void *buf, int count, /* start pipeline bcast */ - MPI_Request* send_request_array = new MPI_Request[size + pipe_length]; - MPI_Request* recv_request_array = new MPI_Request[size + pipe_length]; - MPI_Status* send_status_array = new MPI_Status[size + pipe_length]; - MPI_Status* recv_status_array = new MPI_Status[size + pipe_length]; + auto* send_request_array = new MPI_Request[size + pipe_length]; + auto* recv_request_array = new MPI_Request[size + pipe_length]; + auto* send_status_array = new MPI_Status[size + pipe_length]; + auto* recv_status_array = new MPI_Status[size + pipe_length]; /* root */ if (rank == 0) { sent_count = 0; - int iteration = 0; for (i = 0; i < BCAST_ARRIVAL_PATTERN_AWARE_MAX_NODE; i++) will_send[i] = 0; while (sent_count < (size - 1)) { - iteration++; - /* loop k times to let more processes arrive before start sending data */ for (k = 0; k < 3; k++) { for (i = 1; i < size; i++) { @@ -236,14 +232,12 @@ int bcast__arrival_pattern_aware_wait(void *buf, int count, delete[] recv_status_array; /* end pipeline */ - /* when count is not divisible by block size, use default BCAST for the remainder */ if ((remainder != 0) && (count > segment)) { - XBT_WARN("MPI_bcast_arrival_pattern_aware_wait use default MPI_bcast."); + XBT_INFO("MPI_bcast_arrival_pattern_aware_wait: count is not divisible by block size, use default MPI_bcast for remainder."); colls::bcast((char*)buf + (pipe_length * increment), remainder, datatype, root, comm); } return MPI_SUCCESS; } -} -} +} // namespace simgrid::smpi