X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..15178c7908a80843a430025313d143b7cb52d06a:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index a359f506d5..d3a766b644 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -1,35 +1,32 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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 "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_ && - (pimpl_ == nullptr || pimpl_->state_ == kernel::activity::State::RUNNING)) { + (pimpl_ == nullptr || pimpl_->get_state() == kernel::activity::State::RUNNING)) { XBT_INFO("Comm %p freed before its completion. Did you forget to detach it? (state: %s)", this, get_state_str()); if (pimpl_ != nullptr) XBT_INFO("pimpl_->state: %s", pimpl_->get_state_str()); @@ -44,12 +41,12 @@ 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 = -1; + 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) { + if (c->pimpl_->get_state() == kernel::activity::State::FAILED) { c->complete(State::FAILED); } } @@ -88,6 +85,28 @@ size_t Comm::wait_all_for(const std::vector& comms, double timeout) return comms.size(); } +CommPtr Comm::set_source(Host* from) +{ + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the source of a Comm once it's started (state: %s)", to_c_str(state_)); + from_ = from; + // Setting 'from_' may allow to start the activity, let's try + vetoable_start(); + + return this; +} + +CommPtr Comm::set_destination(Host* to) +{ + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the destination of a Comm once it's started (state: %s)", to_c_str(state_)); + to_ = to; + // Setting 'to_' may allow to start the activity, let's try + vetoable_start(); + + return this; +} + CommPtr Comm::set_rate(double rate) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", @@ -157,9 +176,16 @@ CommPtr Comm::set_payload_size(uint64_t bytes) return this; } -CommPtr Comm::sendto_init(Host* from, Host* to) +CommPtr Comm::sendto_init() { CommPtr res(new Comm()); + res->sender_ = kernel::actor::ActorImpl::self(); + return res; +} + +CommPtr Comm::sendto_init(Host* from, Host* to) +{ + auto res = Comm::sendto_init(); res->from_ = from; res->to_ = to; @@ -193,12 +219,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_); @@ -209,6 +235,11 @@ Comm* Comm::start() if (suspended_) pimpl_->suspend(); + if (not detached_) { + pimpl_->set_iface(this); + pimpl_->set_actor(sender_); + } + state_ = State::STARTED; return this; } @@ -232,12 +263,12 @@ Comm* Comm::wait_for(double timeout) 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_); } @@ -319,6 +350,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