X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54465b4758320eff6148483c24a55bdeabd95f15..a2b4822b3457a5d00803620c1d4a4df77d2b06de:/src/kernel/activity/CommImpl.cpp diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index 796f8135d0..b7351de1d8 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -19,29 +19,30 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size, - double rate, void* src_buff, size_t src_buff_size, + double rate, unsigned char* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout) { smx_activity_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); - SIMCALL_SET_MC_VALUE(simcall, 0); - simcall_HANDLER_comm_wait(simcall, comm, timeout); + SIMCALL_SET_MC_VALUE(*simcall, 0); + simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( - smx_simcall_t /*simcall*/, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, - size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + smx_simcall_t /*simcall*/, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate, + unsigned char* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), // used to copy data if not default one - void* data, int detached) + void* data, bool detached) { XBT_DEBUG("send from mailbox %p", mbox); /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ - simgrid::kernel::activity::CommImplPtr this_comm = simgrid::kernel::activity::CommImplPtr( - new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::SEND)); + simgrid::kernel::activity::CommImplPtr this_comm = + simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl()); + this_comm->set_type(simgrid::kernel::activity::CommImpl::Type::SEND); /* Look for communication synchro matching our needs. We also provide a description of * ourself so that the other side also gets a chance of choosing if it wants to match with us. @@ -68,57 +69,53 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( XBT_DEBUG("Receive already pushed"); other_comm->state_ = SIMIX_READY; - other_comm->type = simgrid::kernel::activity::CommImpl::Type::READY; + other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } - src_proc->comms.push_back(other_comm); if (detached) { - other_comm->detached = true; + other_comm->detach(); other_comm->clean_fun = clean_fun; } else { other_comm->clean_fun = nullptr; + src_proc->comms.push_back(other_comm); } /* Setup the communication synchro */ other_comm->src_actor_ = src_proc; - other_comm->task_size_ = task_size; - other_comm->rate_ = rate; - other_comm->src_buff_ = src_buff; - other_comm->src_buff_size_ = src_buff_size; other_comm->src_data_ = data; + (*other_comm).set_src_buff(src_buff, src_buff_size).set_size(task_size).set_rate(rate); other_comm->match_fun = match_fun; other_comm->copy_data_fun = copy_data_fun; - if (MC_is_active() || MC_record_replay_is_active()) { + if (MC_is_active() || MC_record_replay_is_active()) other_comm->state_ = SIMIX_RUNNING; - return (detached ? nullptr : other_comm); - } - - other_comm->start(); + else + other_comm->start(); return (detached ? nullptr : other_comm); } XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, - void* dst_buff, size_t* dst_buff_size, + unsigned char* dst_buff, size_t* dst_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout, double rate) { smx_activity_t comm = simcall_HANDLER_comm_irecv(simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); - SIMCALL_SET_MC_VALUE(simcall, 0); - simcall_HANDLER_comm_wait(simcall, comm, timeout); + SIMCALL_SET_MC_VALUE(*simcall, 0); + simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( - smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, + smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double rate) { - simgrid::kernel::activity::CommImplPtr this_synchro = simgrid::kernel::activity::CommImplPtr( - new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::RECEIVE)); + simgrid::kernel::activity::CommImplPtr this_synchro = + simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl()); + this_synchro->set_type(simgrid::kernel::activity::CommImpl::Type::RECEIVE); XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get()); simgrid::kernel::activity::CommImplPtr other_comm; @@ -137,11 +134,10 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( other_comm = std::move(this_synchro); mbox->push(other_comm); } else { - if (other_comm->surf_action_ && other_comm->remains() < 1e-12) { + if (other_comm->surf_action_ && other_comm->get_remaining() < 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->type = simgrid::kernel::activity::CommImpl::Type::DONE; - other_comm->mbox = nullptr; + other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE).set_mailbox(nullptr); } } } else { @@ -163,19 +159,18 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get()); other_comm->state_ = SIMIX_READY; - other_comm->type = simgrid::kernel::activity::CommImpl::Type::READY; + other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } receiver->comms.push_back(other_comm); } /* Setup communication synchro */ other_comm->dst_actor_ = receiver; - other_comm->dst_buff_ = dst_buff; - other_comm->dst_buff_size_ = dst_buff_size; other_comm->dst_data_ = data; + other_comm->set_dst_buff(dst_buff, dst_buff_size); - if (rate > -1.0 && (other_comm->rate_ < 0.0 || rate < other_comm->rate_)) - other_comm->rate_ = rate; + if (rate > -1.0 && (other_comm->get_rate() < 0.0 || rate < other_comm->get_rate())) + other_comm->set_rate(rate); other_comm->match_fun = match_fun; other_comm->copy_data_fun = copy_data_fun; @@ -188,156 +183,147 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( return other_comm; } -void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, double timeout) +void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm, double timeout) { /* Associate this simcall to the wait synchro */ - XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro.get()); + XBT_DEBUG("simcall_HANDLER_comm_wait, %p", comm); - synchro->simcalls_.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; + comm->register_simcall(simcall); if (MC_is_active() || MC_record_replay_is_active()) { - int idx = SIMCALL_GET_MC_VALUE(simcall); + int idx = SIMCALL_GET_MC_VALUE(*simcall); if (idx == 0) { - synchro->state_ = SIMIX_DONE; + comm->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 */ if (timeout < 0.0) THROW_IMPOSSIBLE; - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - if (comm->src_actor_ == simcall->issuer) + if (comm->src_actor_ == simcall->issuer_) comm->state_ = SIMIX_SRC_TIMEOUT; else comm->state_ = SIMIX_DST_TIMEOUT; } - boost::static_pointer_cast(synchro)->finish(); + comm->finish(); return; } /* 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) { - boost::static_pointer_cast(synchro)->finish(); + if (comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING) { + comm->finish(); } 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->get_host()->pimpl_cpu->sleep(timeout); - sleep->set_data(synchro.get()); + simgrid::kernel::resource::Action* sleep = simcall->issuer_->get_host()->pimpl_cpu->sleep(timeout); + sleep->set_activity(comm); - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - if (simcall->issuer == comm->src_actor_) + if (simcall->issuer_ == comm->src_actor_) comm->src_timeout_ = sleep; else comm->dst_timeout_ = sleep; } } -void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t synchro) +void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm) { - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - - int res; + bool res; if (MC_is_active() || MC_record_replay_is_active()) { res = comm->src_actor_ && comm->dst_actor_; if (res) - synchro->state_ = SIMIX_DONE; + comm->state_ = SIMIX_DONE; } else { - res = synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING; + res = comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING; } simcall_comm_test__set__result(simcall, res); if (simcall_comm_test__get__result(simcall)) { - synchro->simcalls_.push_back(simcall); - boost::static_pointer_cast(synchro)->finish(); + comm->simcalls_.push_back(simcall); + comm->finish(); } else { - SIMIX_simcall_answer(simcall); + simcall->issuer_->simcall_answer(); } } -void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::ActivityImplPtr comms[], - size_t count) +void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count) { // The default result is -1 -- this means, "nothing is ready". // It can be changed below, but only if something matches. simcall_comm_testany__set__result(simcall, -1); if (MC_is_active() || MC_record_replay_is_active()) { - int idx = SIMCALL_GET_MC_VALUE(simcall); + int idx = SIMCALL_GET_MC_VALUE(*simcall); if (idx == -1) { - SIMIX_simcall_answer(simcall); + simcall->issuer_->simcall_answer(); } else { - simgrid::kernel::activity::ActivityImplPtr synchro = comms[idx]; + simgrid::kernel::activity::CommImpl* comm = comms[idx]; simcall_comm_testany__set__result(simcall, idx); - synchro->simcalls_.push_back(simcall); - synchro->state_ = SIMIX_DONE; - boost::static_pointer_cast(synchro)->finish(); + comm->simcalls_.push_back(simcall); + comm->state_ = SIMIX_DONE; + comm->finish(); } return; } 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) { + simgrid::kernel::activity::CommImpl* comm = comms[i]; + if (comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING) { simcall_comm_testany__set__result(simcall, i); - synchro->simcalls_.push_back(simcall); - boost::static_pointer_cast(synchro)->finish(); + comm->simcalls_.push_back(simcall); + comm->finish(); return; } } - SIMIX_simcall_answer(simcall); + simcall->issuer_->simcall_answer(); } static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) { - unsigned int cursor = 0; - xbt_dynar_t synchros = simcall_comm_waitany__get__comms(simcall); + simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(simcall); + size_t count = simcall_comm_waitany__get__count(simcall); - simgrid::kernel::activity::ActivityImpl* synchro; - xbt_dynar_foreach (synchros, cursor, synchro) { + for (size_t i = 0; i < count; i++) { // Remove the first occurence of simcall: - auto i = boost::range::find(synchro->simcalls_, simcall); - if (i != synchro->simcalls_.end()) - synchro->simcalls_.erase(i); + auto* comm = comms[i]; + auto j = boost::range::find(comm->simcalls_, simcall); + if (j != comm->simcalls_.end()) + comm->simcalls_.erase(j); } } -void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, double timeout) +void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count, + double timeout) { if (MC_is_active() || MC_record_replay_is_active()) { if (timeout > 0.0) xbt_die("Timeout not implemented for waitany in the model-checker"); - int idx = SIMCALL_GET_MC_VALUE(simcall); - auto* synchro = xbt_dynar_get_as(synchros, idx, simgrid::kernel::activity::ActivityImpl*); - synchro->simcalls_.push_back(simcall); + int idx = SIMCALL_GET_MC_VALUE(*simcall); + auto* comm = comms[idx]; + comm->simcalls_.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); - synchro->state_ = SIMIX_DONE; - synchro->finish(); + comm->state_ = SIMIX_DONE; + comm->finish(); return; } if (timeout < 0.0) { - simcall->timer = NULL; + simcall->timeout_cb_ = NULL; } else { - simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() { + simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() { SIMIX_waitany_remove_simcall_from_actions(simcall); simcall_comm_waitany__set__result(simcall, -1); - SIMIX_simcall_answer(simcall); + simcall->issuer_->simcall_answer(); }); } - unsigned int cursor; - simgrid::kernel::activity::ActivityImpl* synchro; - xbt_dynar_foreach (synchros, cursor, synchro) { + for (size_t i = 0; i < count; i++) { /* associate this simcall to the the synchro */ - synchro->simcalls_.push_back(simcall); + auto* comm = comms[i]; + comm->simcalls_.push_back(simcall); /* see if the synchro is already finished */ - if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) { - synchro->finish(); + if (comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING) { + comm->finish(); break; } } @@ -353,8 +339,8 @@ void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, { XBT_DEBUG("Copy the data over"); memcpy(comm->dst_buff_, buff, buff_size); - if (comm->detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the - // original buffer available to the application ASAP + if (comm->detached()) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the + // original buffer available to the application ASAP xbt_free(buff); comm->src_buff_ = nullptr; } @@ -375,34 +361,68 @@ namespace simgrid { namespace kernel { namespace activity { -CommImpl::CommImpl(CommImpl::Type type) : type(type) +CommImpl& CommImpl::set_type(CommImpl::Type type) { - state_ = SIMIX_WAITING; - src_data_ = nullptr; - dst_data_ = nullptr; - XBT_DEBUG("Create comm activity %p", this); + type_ = type; + return *this; +} + +CommImpl& CommImpl::set_size(double size) +{ + size_ = size; + return *this; +} + +CommImpl& CommImpl::set_rate(double rate) +{ + rate_ = rate; + return *this; +} +CommImpl& CommImpl::set_mailbox(MailboxImpl* mbox) +{ + mbox_ = mbox; + return *this; +} + +CommImpl& CommImpl::set_src_buff(unsigned char* buff, size_t size) +{ + src_buff_ = buff; + src_buff_size_ = size; + return *this; +} + +CommImpl& CommImpl::set_dst_buff(unsigned char* buff, size_t* size) +{ + dst_buff_ = buff; + dst_buff_size_ = size; + return *this; +} + +CommImpl& CommImpl::detach() +{ + detached_ = true; + return *this; } CommImpl::~CommImpl() { - XBT_DEBUG("Really free communication %p", this); + XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast(state_), detached_); cleanupSurf(); - if (detached && state_ != SIMIX_DONE) { + if (detached_ && state_ != SIMIX_DONE) { /* the communication has failed and was detached: * we have to free the buffer */ if (clean_fun) clean_fun(src_buff_); src_buff_ = nullptr; + } else if (mbox_) { + mbox_->remove(this); } - - if (mbox) - mbox->remove(this); } /** @brief Starts the simulation of a communication synchro. */ -void CommImpl::start() +CommImpl* CommImpl::start() { /* If both the sender and the receiver are already there, start the communication */ if (state_ == SIMIX_READY) { @@ -410,8 +430,9 @@ void CommImpl::start() s4u::Host* sender = src_actor_->get_host(); s4u::Host* receiver = dst_actor_->get_host(); - surf_action_ = surf_network_model->communicate(sender, receiver, task_size_, rate_); - surf_action_->set_data(this); + surf_action_ = surf_network_model->communicate(sender, receiver, size_, rate_); + surf_action_->set_activity(this); + surf_action_->set_category(get_tracing_category()); state_ = SIMIX_RUNNING; XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", this, sender->get_cname(), @@ -422,7 +443,7 @@ void CommImpl::start() XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(), receiver->get_cname()); state_ = SIMIX_LINK_FAILURE; - cleanupSurf(); + post(); } else if (src_actor_->is_suspended() || dst_actor_->is_suspended()) { /* If any of the process is suspended, create the synchro but stop its execution, @@ -439,6 +460,8 @@ void CommImpl::start() surf_action_->suspend(); } } + + return this; } /** @brief Copy the communication data from the sender's buffer to the receiver's one */ @@ -446,7 +469,7 @@ void CommImpl::copy_data() { size_t buff_size = src_buff_size_; /* If there is no data to copy then return */ - if (not src_buff_ || not dst_buff_ || copied) + if (not src_buff_ || not dst_buff_ || copied_) return; XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", this, @@ -470,7 +493,7 @@ void CommImpl::copy_data() /* Set the copied flag so we copy data only once */ /* (this function might be called from both communication ends) */ - copied = true; + copied_ = true; } void CommImpl::suspend() @@ -493,27 +516,20 @@ void CommImpl::cancel() { /* if the synchro is a waiting state means that it is still in a mbox so remove from it and delete it */ if (state_ == SIMIX_WAITING) { - mbox->remove(this); - state_ = SIMIX_CANCELED; + if (not detached_) { + mbox_->remove(this); + state_ = SIMIX_CANCELED; + } } else if (not MC_is_active() /* when running the MC there are no surf actions */ && not MC_record_replay_is_active() && (state_ == SIMIX_READY || state_ == SIMIX_RUNNING)) { surf_action_->cancel(); } } -/** @brief get the amount remaining from the communication */ -double CommImpl::remains() -{ - return surf_action_->get_remains(); -} - /** @brief This is part of the cleanup process, probably an internal command */ void CommImpl::cleanupSurf() { - if (surf_action_) { - surf_action_->unref(); - surf_action_ = nullptr; - } + clean_action(); if (src_timeout_) { src_timeout_->unref(); @@ -543,7 +559,7 @@ void CommImpl::post() state_ = SIMIX_DONE; XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_, - src_actor_.get(), dst_actor_.get(), detached); + src_actor_.get(), dst_actor_.get(), detached_); /* destroy the surf actions associated with the Simix communication */ cleanupSurf(); @@ -561,36 +577,36 @@ void CommImpl::finish() 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 + * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the * simcall */ - if (simcall->call == SIMCALL_NONE) // FIXME: maybe a better way to handle this case - continue; // if process handling comm is killed - if (simcall->call == SIMCALL_COMM_WAITANY) { + if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case + continue; // if actor handling comm is killed + if (simcall->call_ == SIMCALL_COMM_WAITANY) { SIMIX_waitany_remove_simcall_from_actions(simcall); - if (simcall->timer) { - simcall->timer->remove(); - simcall->timer = nullptr; + if (simcall->timeout_cb_) { + simcall->timeout_cb_->remove(); + simcall->timeout_cb_ = nullptr; } if (not MC_is_active() && not MC_record_replay_is_active()) { - ActivityImpl* synchro = this; - simcall_comm_waitany__set__result(simcall, - xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro)); + CommImpl** comms = simcall_comm_waitany__get__comms(simcall); + size_t count = simcall_comm_waitany__get__count(simcall); + CommImpl** element = std::find(comms, comms + count, this); + int rank = (element != comms + count) ? element - comms : -1; + simcall_comm_waitany__set__result(simcall, rank); } } /* If the synchro is still in a rendez-vous point then remove from it */ - if (mbox) - mbox->remove(this); + if (mbox_) + mbox_->remove(this); XBT_DEBUG("CommImpl::finish(): synchro state = %d", static_cast(state_)); /* Check out for errors */ - if (not simcall->issuer->get_host()->is_on()) { - simcall->issuer->context_->iwannadie = true; - simcall->issuer->exception_ = - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); + if (not simcall->issuer_->get_host()->is_on()) { + simcall->issuer_->context_->iwannadie = true; } else { switch (state_) { @@ -600,28 +616,28 @@ void CommImpl::finish() break; case SIMIX_SRC_TIMEOUT: - simcall->issuer->exception_ = std::make_exception_ptr( - simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the sender")); + simcall->issuer_->exception_ = std::make_exception_ptr( + simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender")); break; case SIMIX_DST_TIMEOUT: - simcall->issuer->exception_ = std::make_exception_ptr( - simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the receiver")); + simcall->issuer_->exception_ = std::make_exception_ptr( + simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the receiver")); break; case SIMIX_SRC_HOST_FAILURE: - if (simcall->issuer == src_actor_) - simcall->issuer->context_->iwannadie = true; + if (simcall->issuer_ == src_actor_) + simcall->issuer_->context_->iwannadie = true; else - simcall->issuer->exception_ = + simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); break; case SIMIX_DST_HOST_FAILURE: - if (simcall->issuer == dst_actor_) - simcall->issuer->context_->iwannadie = true; + if (simcall->issuer_ == dst_actor_) + simcall->issuer_->context_->iwannadie = true; else - simcall->issuer->exception_ = + simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); break; @@ -629,74 +645,65 @@ void CommImpl::finish() XBT_DEBUG("Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) " "detached:%d", this, src_actor_ ? src_actor_->get_host()->get_cname() : nullptr, - dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer->get_cname(), - simcall->issuer, detached); - if (src_actor_ == simcall->issuer) { + dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer_->get_cname(), + simcall->issuer_, detached_); + if (src_actor_ == simcall->issuer_) { XBT_DEBUG("I'm source"); - } else if (dst_actor_ == simcall->issuer) { + } else if (dst_actor_ == simcall->issuer_) { XBT_DEBUG("I'm dest"); } else { XBT_DEBUG("I'm neither source nor dest"); } - simcall->issuer->throw_exception( + simcall->issuer_->throw_exception( std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Link failure"))); break; case SIMIX_CANCELED: - if (simcall->issuer == dst_actor_) - simcall->issuer->exception_ = std::make_exception_ptr( + if (simcall->issuer_ == dst_actor_) + simcall->issuer_->exception_ = std::make_exception_ptr( simgrid::CancelException(XBT_THROW_POINT, "Communication canceled by the sender")); else - simcall->issuer->exception_ = std::make_exception_ptr( + simcall->issuer_->exception_ = std::make_exception_ptr( simgrid::CancelException(XBT_THROW_POINT, "Communication canceled by the receiver")); break; default: xbt_die("Unexpected synchro state in CommImpl::finish: %d", static_cast(state_)); } + simcall->issuer_->simcall_answer(); } - /* if there is an exception during a waitany or a testany, indicate the position of the failed communication */ - if (simcall->issuer->exception_ && - (simcall->call == SIMCALL_COMM_WAITANY || simcall->call == SIMCALL_COMM_TESTANY)) { + 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) { - ActivityImpl* synchro = this; - 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, this); - if (element == comms + count) - rank = -1; - else - rank = element - comms; + CommImpl** comms; + size_t count; + if (simcall->call_ == SIMCALL_COMM_WAITANY) { + comms = simcall_comm_waitany__get__comms(simcall); + count = simcall_comm_waitany__get__count(simcall); + } else { + /* simcall->call_ == SIMCALL_COMM_TESTANY */ + comms = simcall_comm_testany__get__comms(simcall); + count = simcall_comm_testany__get__count(simcall); } + CommImpl** element = std::find(comms, comms + count, this); + int rank = (element != comms + count) ? element - comms : -1; // In order to modify the exception we have to rethrow it: try { - std::rethrow_exception(simcall->issuer->exception_); - } catch (simgrid::TimeoutError& e) { - e.value = rank; - simcall->issuer->exception_ = std::make_exception_ptr(e); - } catch (simgrid::NetworkFailureException& e) { - e.value = rank; - simcall->issuer->exception_ = std::make_exception_ptr(e); - } catch (simgrid::CancelException& e) { - e.value = rank; - simcall->issuer->exception_ = std::make_exception_ptr(e); + std::rethrow_exception(simcall->issuer_->exception_); + } catch (simgrid::Exception& e) { + e.value = rank; } } - simcall->issuer->waiting_synchro = nullptr; - simcall->issuer->comms.remove(this); - if (detached) { - if (simcall->issuer == src_actor_) { + simcall->issuer_->waiting_synchro = nullptr; + simcall->issuer_->comms.remove(this); + if (detached_) { + if (simcall->issuer_ == src_actor_) { if (dst_actor_) dst_actor_->comms.remove(this); - } else if (simcall->issuer == dst_actor_) { + } else if (simcall->issuer_ == dst_actor_) { if (src_actor_) src_actor_->comms.remove(this); } else { @@ -704,11 +711,6 @@ void CommImpl::finish() src_actor_->comms.remove(this); } } - - if (simcall->issuer->get_host()->is_on()) - SIMIX_simcall_answer(simcall); - else - simcall->issuer->context_->iwannadie = true; } }