X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/500d56f4d9b6e10ad5bfa2b96e0154f212a3a505..517bc8b8f3cf99cd8e23e94a729555f11948c5a9:/src/kernel/activity/CommImpl.cpp?ds=sidebyside diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index e3ea115191..ba477b802d 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -3,18 +3,17 @@ /* 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 +#include + #include "src/kernel/activity/CommImpl.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/resource/Action.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/modelchecker.h" -#include "simgrid/s4u/Host.hpp" #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/context/Context.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); @@ -55,11 +54,11 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen if (not other_comm) { other_comm = std::move(this_comm); - if (mbox->permanent_receiver_ != nullptr) { + if (mbox->is_permanent()) { // this mailbox is for small messages, which have to be sent right now other_comm->state_ = simgrid::kernel::activity::State::READY; - other_comm->dst_actor_ = mbox->permanent_receiver_.get(); - mbox->done_comm_queue_.push_back(other_comm); + other_comm->dst_actor_ = mbox->get_permanent_receiver().get(); + mbox->push_done(other_comm); XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get()); } else { @@ -119,7 +118,7 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_ 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->is_permanent() && mbox->has_some_done_comm()) { 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 = mbox->find_matching_comm(simgrid::kernel::activity::CommImpl::Type::SEND, match_fun, data, @@ -150,7 +149,7 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_ /*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->size()); other_comm = std::move(this_synchro); mbox->push(other_comm); } else { @@ -206,33 +205,29 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi /******************************************************************************/ /* SIMIX_comm_copy_data callbacks */ /******************************************************************************/ +// XBT_ATTRIB_DEPRECATED_v333 void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t)) { simgrid::kernel::activity::CommImpl::set_copy_data_callback(callback); } +// XBT_ATTRIB_DEPRECATED_v333 void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { - 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 - xbt_free(buff); - comm->src_buff_ = nullptr; - } + simgrid::s4u::Comm::copy_buffer_callback(comm, buff, buff_size); } +// XBT_ATTRIB_DEPRECATED_v333 void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { - xbt_assert((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); - *(void**)(comm->dst_buff_) = buff; + simgrid::s4u::Comm::copy_pointer_callback(comm, buff, buff_size); } namespace simgrid { namespace kernel { namespace activity { -void (*CommImpl::copy_data_callback_)(CommImpl*, void*, size_t) = &SIMIX_comm_copy_pointer_callback; +void (*CommImpl::copy_data_callback_)(CommImpl*, void*, size_t) = &s4u::Comm::copy_pointer_callback; void CommImpl::set_copy_data_callback(void (*callback)(CommImpl*, void*, size_t)) { @@ -306,9 +301,9 @@ CommImpl* CommImpl::start() from_ = from_ != nullptr ? from_ : src_actor_->get_host(); to_ = to_ != nullptr ? to_ : dst_actor_->get_host(); - /* FIXME[donassolo]: getting the network_model from the origin host - * Soon we need to change this function to first get the routes and later - * create the respective surf actions */ + /* Getting the network_model from the origin host + * Valid while we have a single network model, otherwise we would need to change this function to first get the + * routes and later create the respective surf actions */ auto net_model = from_->get_netpoint()->get_englobing_zone()->get_network_model(); surf_action_ = net_model->communicate(from_, to_, size_, rate_); @@ -579,8 +574,8 @@ void CommImpl::finish() simcall->timeout_cb_ = nullptr; } if (not MC_is_active() && not MC_record_replay_is_active()) { - CommImpl** element = std::find(comms, comms + count, this); - int rank = (element != comms + count) ? element - comms : -1; + auto element = std::find(comms, comms + count, this); + ssize_t rank = (element != comms + count) ? element - comms : -1; simcall_comm_waitany__set__result(simcall, rank); } } @@ -591,6 +586,10 @@ void CommImpl::finish() simcall->issuer_->context_->set_wannadie(); } else { switch (state_) { + case State::FAILED: + simcall->issuer_->exception_ = + std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); + break; case State::SRC_TIMEOUT: simcall->issuer_->exception_ = std::make_exception_ptr( TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender")); @@ -604,17 +603,21 @@ void CommImpl::finish() case State::SRC_HOST_FAILURE: if (simcall->issuer_ == src_actor_) simcall->issuer_->context_->set_wannadie(); - else + else { + state_ = kernel::activity::State::FAILED; simcall->issuer_->exception_ = std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); + } break; case State::DST_HOST_FAILURE: if (simcall->issuer_ == dst_actor_) simcall->issuer_->context_->set_wannadie(); - else + else { + state_ = kernel::activity::State::FAILED; simcall->issuer_->exception_ = std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); + } break; case State::LINK_FAILURE: @@ -630,6 +633,7 @@ void CommImpl::finish() } else { XBT_DEBUG("I'm neither source nor dest"); } + state_ = kernel::activity::State::FAILED; simcall->issuer_->throw_exception( std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Link failure"))); break; @@ -663,8 +667,8 @@ void CommImpl::finish() 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; + auto element = std::find(comms, comms + count, this); + ssize_t 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_);