X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af4023f2adc7976a736077c23829d217e7b89637..e7c34bc069d13721bf6adfdf000c5fc502cdaf0e:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 173e0af9c5..1d8f5fcedf 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -1,27 +1,20 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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 - -#include - -#include "src/kernel/activity/CommImpl.hpp" -#include - -#include "simgrid/s4u/Host.hpp" - #include "mc/mc.h" -#include "simgrid/s4u/Activity.hpp" -#include "simgrid/s4u/Mailbox.hpp" +#include "simgrid/Exception.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/mc/mc_replay.hpp" +#include "src/simix/smx_network_private.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" - #include "src/surf/network_interface.hpp" +#include +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall); @@ -29,9 +22,14 @@ static void SIMIX_comm_copy_data(smx_activity_t comm); 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 type The type of communication we are looking for (comm_send, comm_recv) - * \return The communication activity if found, nullptr otherwise + * @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 _find_matching_comm(boost::circular_buffer_space_optimized* deque, e_smx_comm_type_t type, @@ -101,16 +99,16 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( * * If it is not found then push our communication into the rendez-vous point */ simgrid::kernel::activity::CommImplPtr other_comm = - _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_comm, /*remove_matching*/ true); + _find_matching_comm(&mbox->comm_queue_, SIMIX_COMM_RECEIVE, match_fun, data, this_comm, /*remove_matching*/ true); if (not other_comm) { other_comm = std::move(this_comm); - if (mbox->permanent_receiver != nullptr) { + if (mbox->permanent_receiver_ != nullptr) { //this mailbox is for small messages, which have to be sent right now - other_comm->state = SIMIX_READY; - other_comm->dst_proc=mbox->permanent_receiver.get(); - mbox->done_comm_queue.push_back(other_comm); + other_comm->state_ = SIMIX_READY; + other_comm->dst_proc = mbox->permanent_receiver_.get(); + mbox->done_comm_queue_.push_back(other_comm); XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get()); }else{ @@ -119,7 +117,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( } else { XBT_DEBUG("Receive already pushed"); - other_comm->state = SIMIX_READY; + other_comm->state_ = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; } src_proc->comms.push_back(other_comm); @@ -144,7 +142,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( if (MC_is_active() || MC_record_replay_is_active()) { - other_comm->state = SIMIX_RUNNING; + other_comm->state_ = SIMIX_RUNNING; return (detached ? nullptr : other_comm); } @@ -184,11 +182,11 @@ SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_ simgrid::kernel::activity::CommImplPtr other_comm; //communication already done, get it inside the list of completed comms - if (mbox->permanent_receiver != nullptr && not mbox->done_comm_queue.empty()) { + if (mbox->permanent_receiver_ != nullptr && not mbox->done_comm_queue_.empty()) { XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication"); //find a match in the list of already received comms - other_comm = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, + other_comm = _find_matching_comm(&mbox->done_comm_queue_, SIMIX_COMM_SEND, match_fun, data, this_synchro, /*remove_matching*/ true); //if not found, assume the receiver came first, register it to the mailbox in the classical way if (not other_comm) { @@ -196,9 +194,9 @@ SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_ other_comm = std::move(this_synchro); mbox->push(other_comm); } else { - if (other_comm->surf_comm && other_comm->remains() < 1e-12) { + if (other_comm->surfAction_ && other_comm->remains() < 1e-12) { XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get()); - other_comm->state = SIMIX_DONE; + other_comm->state_ = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; } @@ -210,17 +208,17 @@ SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_ * ourself so that the other side also gets a chance of choosing if it wants to match with us. * * If it is not found then push our communication into the rendez-vous point */ - other_comm = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, + other_comm = _find_matching_comm(&mbox->comm_queue_, SIMIX_COMM_SEND, match_fun, data, this_synchro, /*remove_matching*/ true); if (other_comm == nullptr) { - XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->comm_queue.size()); + XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->comm_queue_.size()); other_comm = std::move(this_synchro); mbox->push(other_comm); } else { XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get()); - other_comm->state = SIMIX_READY; + other_comm->state_ = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; } dst_proc->comms.push_back(other_comm); @@ -239,7 +237,7 @@ SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_ other_comm->copy_data_fun = copy_data_fun; if (MC_is_active() || MC_record_replay_is_active()) { - other_comm->state = SIMIX_RUNNING; + other_comm->state_ = SIMIX_RUNNING; return other_comm; } @@ -256,7 +254,7 @@ smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data) { - XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); + XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue_); simgrid::kernel::activity::CommImplPtr this_comm; int smx_type; if(type == 1){ @@ -267,15 +265,15 @@ smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int t smx_type = SIMIX_COMM_SEND; } smx_activity_t other_synchro=nullptr; - if (mbox->permanent_receiver != nullptr && not mbox->done_comm_queue.empty()) { + if (mbox->permanent_receiver_ != nullptr && not mbox->done_comm_queue_.empty()) { XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something"); - other_synchro = _find_matching_comm(&mbox->done_comm_queue, - (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); + other_synchro = _find_matching_comm(&mbox->done_comm_queue_, (e_smx_comm_type_t)smx_type, match_fun, data, + this_comm, /*remove_matching*/ false); } if (not other_synchro) { XBT_DEBUG("check if we have more luck in the normal mailbox"); - other_synchro = _find_matching_comm(&mbox->comm_queue, - (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); + other_synchro = _find_matching_comm(&mbox->comm_queue_, (e_smx_comm_type_t)smx_type, match_fun, data, this_comm, + /*remove_matching*/ false); } return other_synchro; @@ -286,13 +284,13 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do /* Associate this simcall to the wait synchro */ XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro.get()); - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = synchro; if (MC_is_active() || MC_record_replay_is_active()) { int idx = SIMCALL_GET_MC_VALUE(simcall); if (idx == 0) { - synchro->state = SIMIX_DONE; + synchro->state_ = SIMIX_DONE; } else { /* If we reached this point, the wait simcall must have a timeout */ /* Otherwise it shouldn't be enabled and executed by the MC */ @@ -302,9 +300,9 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); if (comm->src_proc == simcall->issuer) - comm->state = SIMIX_SRC_TIMEOUT; + comm->state_ = SIMIX_SRC_TIMEOUT; else - comm->state = SIMIX_DST_TIMEOUT; + comm->state_ = SIMIX_DST_TIMEOUT; } SIMIX_comm_finish(synchro); @@ -313,12 +311,11 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do /* If the synchro has already finish perform the error handling, */ /* otherwise set up a waiting timeout on the right side */ - if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { + if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) { SIMIX_comm_finish(synchro); - } else { /* we need a surf sleep action even when there is no timeout, otherwise surf won't tell us when the host - fails */ - surf_action_t sleep = simcall->issuer->host->pimpl_cpu->sleep(timeout); - sleep->setData(synchro.get()); + } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */ + simgrid::kernel::resource::Action* sleep = simcall->issuer->host_->pimpl_cpu->sleep(timeout); + sleep->set_data(synchro.get()); simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); @@ -334,21 +331,19 @@ void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t synchro) simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); + int res; + if (MC_is_active() || MC_record_replay_is_active()){ - simcall_comm_test__set__result(simcall, comm->src_proc && comm->dst_proc); - if (simcall_comm_test__get__result(simcall)){ - synchro->state = SIMIX_DONE; - synchro->simcalls.push_back(simcall); - SIMIX_comm_finish(synchro); - } else { - SIMIX_simcall_answer(simcall); - } - return; + res = comm->src_proc && comm->dst_proc; + if (res) + synchro->state_ = SIMIX_DONE; + } else { + res = synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING; } - simcall_comm_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING)); + simcall_comm_test__set__result(simcall, res); if (simcall_comm_test__get__result(simcall)) { - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); SIMIX_comm_finish(synchro); } else { SIMIX_simcall_answer(simcall); @@ -369,8 +364,8 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi }else{ simgrid::kernel::activity::ActivityImplPtr synchro = comms[idx]; simcall_comm_testany__set__result(simcall, idx); - synchro->simcalls.push_back(simcall); - synchro->state = SIMIX_DONE; + synchro->simcalls_.push_back(simcall); + synchro->state_ = SIMIX_DONE; SIMIX_comm_finish(synchro); } return; @@ -378,9 +373,9 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi for (std::size_t i = 0; i != count; ++i) { simgrid::kernel::activity::ActivityImplPtr synchro = comms[i]; - if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { + if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) { simcall_comm_testany__set__result(simcall, i); - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); SIMIX_comm_finish(synchro); return; } @@ -395,9 +390,9 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, d xbt_die("Timeout not implemented for waitany in the model-checker"); int idx = SIMCALL_GET_MC_VALUE(simcall); smx_activity_t synchro = xbt_dynar_get_as(synchros, idx, smx_activity_t); - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); - synchro->state = SIMIX_DONE; + synchro->state_ = SIMIX_DONE; SIMIX_comm_finish(synchro); return; } @@ -417,10 +412,10 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, d xbt_dynar_foreach(synchros, cursor, ptr){ smx_activity_t synchro = simgrid::kernel::activity::ActivityImplPtr(ptr); /* associate this simcall to the the synchro */ - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); /* see if the synchro is already finished */ - if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING){ + if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) { SIMIX_comm_finish(synchro); break; } @@ -437,68 +432,68 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) smx_activity_t synchro = simgrid::kernel::activity::ActivityImplPtr(ptr); // Remove the first occurence of simcall: - auto i = boost::range::find(synchro->simcalls, simcall); - if (i != synchro->simcalls.end()) - synchro->simcalls.erase(i); + auto i = boost::range::find(synchro->simcalls_, simcall); + if (i != synchro->simcalls_.end()) + synchro->simcalls_.erase(i); } } /** - * \brief Starts the simulation of a communication synchro. - * \param synchro the communication synchro + * @brief Starts the simulation of a communication synchro. + * @param comm the communication that will be started */ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) { /* If both the sender and the receiver are already there, start the communication */ - if (comm->state == SIMIX_READY) { + if (comm->state_ == SIMIX_READY) { - simgrid::s4u::Host* sender = comm->src_proc->host; - simgrid::s4u::Host* receiver = comm->dst_proc->host; + simgrid::s4u::Host* sender = comm->src_proc->host_; + simgrid::s4u::Host* receiver = comm->dst_proc->host_; - comm->surf_comm = surf_network_model->communicate(sender, receiver, comm->task_size, comm->rate); - comm->surf_comm->setData(comm.get()); - comm->state = SIMIX_RUNNING; + comm->surfAction_ = surf_network_model->communicate(sender, receiver, comm->task_size, comm->rate); + comm->surfAction_->set_data(comm.get()); + comm->state_ = SIMIX_RUNNING; - XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), sender->getCname(), - receiver->getCname(), comm->surf_comm); + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), sender->get_cname(), + receiver->get_cname(), comm->surfAction_); /* If a link is failed, detect it immediately */ - if (comm->surf_comm->getState() == simgrid::surf::Action::State::failed) { - XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->getCname(), - receiver->getCname()); - comm->state = SIMIX_LINK_FAILURE; + if (comm->surfAction_->get_state() == simgrid::kernel::resource::Action::State::FAILED) { + XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(), + receiver->get_cname()); + comm->state_ = SIMIX_LINK_FAILURE; 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()) + if (comm->src_proc->is_suspended() || comm->dst_proc->is_suspended()) { + if (comm->src_proc->is_suspended()) XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the " "communication", - comm->src_proc->getCname(), comm->src_proc->host->getCname()); + comm->src_proc->get_cname(), comm->src_proc->host_->get_cname()); else XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the " "communication", - comm->dst_proc->getCname(), comm->dst_proc->host->getCname()); + comm->dst_proc->get_cname(), comm->dst_proc->host_->get_cname()); - comm->surf_comm->suspend(); + comm->surfAction_->suspend(); } } } /** - * \brief Answers the SIMIX simcalls associated to a communication synchro. - * \param synchro a finished communication synchro + * @brief Answers the SIMIX simcalls associated to a communication synchro. + * @param synchro a finished communication synchro */ void SIMIX_comm_finish(smx_activity_t synchro) { simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); - while (not synchro->simcalls.empty()) { - smx_simcall_t simcall = synchro->simcalls.front(); - synchro->simcalls.pop_front(); + while (not synchro->simcalls_.empty()) { + smx_simcall_t simcall = synchro->simcalls_.front(); + synchro->simcalls_.pop_front(); /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany * list. Afterwards, get the position of the actual synchro in the waitany dynar and return it as the result of the @@ -521,15 +516,16 @@ void SIMIX_comm_finish(smx_activity_t synchro) if (comm->mbox) comm->mbox->remove(comm); - XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state); + XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state_); /* Check out for errors */ - if (simcall->issuer->host->isOff()) { - simcall->issuer->context->iwannadie = 1; - SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + if (simcall->issuer->host_->is_off()) { + simcall->issuer->context_->iwannadie = true; + simcall->issuer->exception = + std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); } else { - switch (comm->state) { + switch (comm->state_) { case SIMIX_DONE: XBT_DEBUG("Communication %p complete!", synchro.get()); @@ -537,32 +533,36 @@ void SIMIX_comm_finish(smx_activity_t synchro) break; case SIMIX_SRC_TIMEOUT: - SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of sender"); + simcall->issuer->exception = std::make_exception_ptr( + simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the sender")); break; case SIMIX_DST_TIMEOUT: - SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of receiver"); + simcall->issuer->exception = std::make_exception_ptr( + simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the receiver")); break; case SIMIX_SRC_HOST_FAILURE: if (simcall->issuer == comm->src_proc) - simcall->issuer->context->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; else - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); + simcall->issuer->exception = + std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); break; case SIMIX_DST_HOST_FAILURE: if (simcall->issuer == comm->dst_proc) - simcall->issuer->context->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; else - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); + simcall->issuer->exception = + std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); break; case SIMIX_LINK_FAILURE: XBT_DEBUG("Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) " "detached:%d", - synchro.get(), comm->src_proc ? comm->src_proc->host->getCname() : nullptr, - comm->dst_proc ? comm->dst_proc->host->getCname() : nullptr, simcall->issuer->getCname(), + synchro.get(), comm->src_proc ? comm->src_proc->host_->get_cname() : nullptr, + comm->dst_proc ? comm->dst_proc->host_->get_cname() : nullptr, simcall->issuer->get_cname(), simcall->issuer, comm->detached); if (comm->src_proc == simcall->issuer) { XBT_DEBUG("I'm source"); @@ -571,7 +571,8 @@ void SIMIX_comm_finish(smx_activity_t synchro) } else { XBT_DEBUG("I'm neither source nor dest"); } - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure"); + simcall->issuer->throw_exception( + std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Link failure"))); break; case SIMIX_CANCELED: @@ -582,40 +583,49 @@ void SIMIX_comm_finish(smx_activity_t synchro) break; default: - xbt_die("Unexpected synchro state in SIMIX_comm_finish: %d", (int)synchro->state); + xbt_die("Unexpected synchro state in SIMIX_comm_finish: %d", (int)synchro->state_); } } /* if there is an exception during a waitany or a testany, indicate the position of the failed communication */ - if (simcall->issuer->exception) { + if (simcall->issuer->exception && + (simcall->call == SIMCALL_COMM_WAITANY || simcall->call == SIMCALL_COMM_TESTANY)) { + // First retrieve the rank of our failing synchro + int rank = -1; + if (simcall->call == SIMCALL_COMM_WAITANY) { + rank = xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro); + } else if (simcall->call == SIMCALL_COMM_TESTANY) { + rank = -1; + 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) + rank = -1; + else + rank = element - comms; + } + // In order to modify the exception we have to rethrow it: try { std::rethrow_exception(simcall->issuer->exception); - } - catch(xbt_ex& e) { - if (simcall->call == SIMCALL_COMM_WAITANY) { - e.value = xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro); - } - else if (simcall->call == SIMCALL_COMM_TESTANY) { - e.value = -1; - 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) - e.value = -1; - else - e.value = element - comms; - } + } catch (simgrid::TimeoutError& e) { + e.value = rank; simcall->issuer->exception = std::make_exception_ptr(e); - } - catch(...) { - // Nothing to do + } catch (simgrid::NetworkFailureException& e) { + e.value = rank; + simcall->issuer->exception = std::make_exception_ptr(e); + } catch (xbt_ex& e) { + if (e.category == cancel_error) { + e.value = rank; + simcall->issuer->exception = std::make_exception_ptr(e); + } else { + xbt_die("Unexpected xbt_ex(%s). Please enhance this code", xbt_ex_catname(e.category)); + } } } - if (simcall->issuer->host->isOff()) { - simcall->issuer->context->iwannadie = 1; - } + if (simcall->issuer->host_->is_off()) + simcall->issuer->context_->iwannadie = true; simcall->issuer->waiting_synchro = nullptr; simcall->issuer->comms.remove(synchro); @@ -685,8 +695,8 @@ void SIMIX_comm_copy_data(smx_activity_t synchro) return; XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", comm.get(), - comm->src_proc ? comm->src_proc->host->getCname() : "a finished process", comm->src_buff, - comm->dst_proc ? comm->dst_proc->host->getCname() : "a finished process", comm->dst_buff, buff_size); + comm->src_proc ? comm->src_proc->host_->get_cname() : "a finished process", comm->src_buff, + comm->dst_proc ? comm->dst_proc->host_->get_cname() : "a finished process", comm->dst_buff, buff_size); /* Copy at most dst_buff_size bytes of the message to receiver's buffer */ if (comm->dst_buff_size)