X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bb682d71205b17c0c0d45d19891681ec526d4ff5..9ceefed14c83a0f6ea5f78e3acafd53181dc4fa1:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index bcf557de35..2b4bcd6ee8 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -3,29 +3,26 @@ /* 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 "src/msg/msg_private.hpp" -#include "xbt/log.h" - -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Mailbox.hpp" +//#include "src/msg/msg_private.hpp" +//#include "xbt/log.h" +#include #include +#include +#include +#include + +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous communications"); namespace simgrid { namespace s4u { -xbt::signal Comm::on_start; +xbt::signal Comm::on_send; +xbt::signal Comm::on_recv; xbt::signal Comm::on_completion; -void Comm::complete(Activity::State state) -{ - Activity::complete(state); - on_completion(*this); -} - Comm::~Comm() { if (state_ == State::STARTED && not detached_ && @@ -44,7 +41,17 @@ ssize_t Comm::wait_any_for(const std::vector& comms, double timeout) std::vector rcomms(comms.size()); std::transform(begin(comms), end(comms), begin(rcomms), [](const CommPtr& comm) { return static_cast(comm->pimpl_.get()); }); - ssize_t changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout); + ssize_t changed_pos; + try { + changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout); + } catch (const NetworkFailureException& e) { + for (auto c : comms) { + if (c->pimpl_->state_ == kernel::activity::State::FAILED) { + c->complete(State::FAILED); + } + } + e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); + } if (changed_pos != -1) comms.at(changed_pos)->complete(State::FINISHED); return changed_pos; @@ -141,7 +148,7 @@ CommPtr Comm::set_dst_data(void** buff, size_t size) dst_buff_size_ = size; return this; } -CommPtr Comm::set_payload_size(double bytes) +CommPtr Comm::set_payload_size(uint64_t bytes) { Activity::set_remaining(bytes); return this; @@ -150,20 +157,21 @@ CommPtr Comm::set_payload_size(double bytes) CommPtr Comm::sendto_init(Host* from, Host* to) { CommPtr res(new Comm()); + res->sender_ = kernel::actor::ActorImpl::self(); res->from_ = from; res->to_ = to; return res; } -CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes) +CommPtr Comm::sendto_async(Host* from, Host* to, uint64_t simulated_size_in_bytes) { auto res = Comm::sendto_init(from, to)->set_payload_size(simulated_size_in_bytes); res->vetoable_start(); return res; } -void Comm::sendto(Host* from, Host* to, double simulated_size_in_bytes) +void Comm::sendto(Host* from, Host* to, uint64_t simulated_size_in_bytes) { sendto_async(from, to, simulated_size_in_bytes)->wait(); } @@ -183,12 +191,12 @@ Comm* Comm::start() }); } else if (src_buff_ != nullptr) { // Sender side - on_start(*this, true /* is_sender*/); + on_send(*this); pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, clean_fun_, copy_data_function_, get_user_data(), detached_); } else if (dst_buff_ != nullptr) { // Receiver side xbt_assert(not detached_, "Receive cannot be detached"); - on_start(*this, false /*is_sender*/); + on_recv(*this); pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, get_user_data(), rate_); @@ -199,6 +207,11 @@ Comm* Comm::start() if (suspended_) pimpl_->suspend(); + if (not detached_) { + pimpl_->set_iface(this); + pimpl_->set_actor(sender_); + } + state_ = State::STARTED; return this; } @@ -214,25 +227,32 @@ Comm* Comm::wait_for(double timeout) switch (state_) { case State::FINISHED: break; + case State::FAILED: + throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed communication"); case State::INITED: case State::STARTING: // It's not started yet. Do it in one simcall if it's a regular communication if (from_ != nullptr || to_ != nullptr) { return vetoable_start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls } else if (src_buff_ != nullptr) { - on_start(*this, true /*is_sender*/); + on_send(*this); simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, copy_data_function_, get_user_data(), timeout); } else { // Receiver - on_start(*this, false /*is_sender*/); + on_recv(*this); simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, get_user_data(), timeout, rate_); } break; case State::STARTED: - simcall_comm_wait(get_impl(), timeout); + try { + simcall_comm_wait(get_impl(), timeout); + } catch (const NetworkFailureException& e) { + complete(State::FAILED); + e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); + } break; case State::CANCELED: @@ -302,6 +322,22 @@ CommPtr Comm::set_copy_data_callback(void (*callback)(kernel::activity::CommImpl copy_data_function_ = callback; return this; } +void Comm::copy_buffer_callback(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; + } +} + +void Comm::copy_pointer_callback(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; +} } // namespace s4u } // namespace simgrid