X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e08a76b1a43e12302ebd25abbe8830fcefca72b..2fb822c48e7a43db651782eaf2cbaf1e762b32c7:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index b45565785f..8708df0668 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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. */ @@ -30,7 +30,12 @@ static void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr synchro); /** * \brief Checks if there is a communication activity queued in a deque matching our needs + * \param deque where to search into * \param type The type of communication we are looking for (comm_send, comm_recv) + * \param match_fun the function to apply + * \param this_user_data additional parameter to the match_fun + * \param my_synchro what to compare against + * \param remove_matching whether or not to clean the found object from the queue * \return The communication activity if found, nullptr otherwise */ static simgrid::kernel::activity::CommImplPtr @@ -445,7 +450,7 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) /** * \brief Starts the simulation of a communication synchro. - * \param synchro the communication synchro + * \param comm the communication that will be started */ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) { @@ -470,7 +475,7 @@ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) comm->cleanupSurf(); } - /* If any of the process is suspend, create the synchro but stop its execution, + /* If any of the process is suspended, create the synchro but stop its execution, it will be restarted when the sender process resume */ if (comm->src_proc->isSuspended() || comm->dst_proc->isSuspended()) { if (comm->src_proc->isSuspended()) @@ -598,7 +603,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) } else if (simcall->call == SIMCALL_COMM_TESTANY) { e.value = -1; - auto comms = simcall_comm_testany__get__comms(simcall); + auto* comms = simcall_comm_testany__get__comms(simcall); auto count = simcall_comm_testany__get__count(simcall); auto element = std::find(comms, comms + count, synchro); if (element == comms + count)