X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/184df84fae795c96fafef4e5123d657c39908850..09392faf42646e631a4e42553e901410eb3e488e:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 5ffb612d05..aec421bfa9 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -1,34 +1,57 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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/Mailbox.hpp" - +#include +#include #include +#include +#include +#include +#include + +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" +#include "src/kernel/actor/SimcallObserver.hpp" +#include "src/mc/mc.h" +#include "src/mc/mc_replay.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_completion; +namespace simgrid::s4u { +xbt::signal Comm::on_send; +xbt::signal Comm::on_recv; + +CommPtr Comm::set_copy_data_callback(const std::function& callback) +{ + copy_data_function_ = callback; + return this; +} + +void Comm::copy_buffer_callback(kernel::activity::CommImpl* comm, void* buff, + size_t buff_size) // XBT_ATTRIB_DEPRECATED_v338 +{ + XBT_DEBUG("Copy the data over"); + memcpy(comm->dst_buff_, buff, buff_size); + if (comm->is_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::complete(Activity::State state) +void Comm::copy_pointer_callback(kernel::activity::CommImpl* comm, void* buff, + size_t buff_size) // XBT_ATTRIB_DEPRECATED_v338 { - Activity::complete(state); - on_completion(*this); + xbt_assert((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); + *(void**)(comm->dst_buff_) = buff; } 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()); @@ -38,37 +61,176 @@ Comm::~Comm() } } -int Comm::wait_any_for(const std::vector* comms, double timeout) +void Comm::send(kernel::actor::ActorImpl* sender, const Mailbox* mbox, double task_size, double rate, void* src_buff, + size_t src_buff_size, + const std::function& match_fun, + const std::function& copy_data_fun, + void* data, double timeout) +{ + /* checking for infinite values */ + xbt_assert(std::isfinite(task_size), "task_size is not finite!"); + xbt_assert(std::isfinite(rate), "rate is not finite!"); + xbt_assert(std::isfinite(timeout), "timeout is not finite!"); + + xbt_assert(mbox, "No rendez-vous point defined for send"); + + if (MC_is_active() || MC_record_replay_is_active()) { + /* the model-checker wants two separate simcalls, and wants comm to be nullptr during the simcall */ + simgrid::kernel::activity::ActivityImplPtr comm = nullptr; + + simgrid::kernel::actor::CommIsendSimcall send_observer{ + sender, mbox->get_impl(), task_size, rate, static_cast(src_buff), + src_buff_size, match_fun, nullptr, copy_data_fun, data, + false, "Isend"}; + comm = simgrid::kernel::actor::simcall_answered( + [&send_observer] { return simgrid::kernel::activity::CommImpl::isend(&send_observer); }, &send_observer); + + if (simgrid::kernel::actor::ActivityWaitSimcall wait_observer{sender, comm.get(), timeout, "Wait"}; + simgrid::kernel::actor::simcall_blocking( + [&wait_observer] { + wait_observer.get_activity()->wait_for(wait_observer.get_issuer(), wait_observer.get_timeout()); + }, + &wait_observer)) { + throw simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"); + } + comm = nullptr; + } else { + simgrid::kernel::actor::CommIsendSimcall observer(sender, mbox->get_impl(), task_size, rate, + static_cast(src_buff), src_buff_size, match_fun, + nullptr, copy_data_fun, data, false, "Isend"); + simgrid::kernel::actor::simcall_blocking([&observer, timeout] { + simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::isend(&observer); + comm->wait_for(observer.get_issuer(), timeout); + }); + } +} + +void Comm::recv(kernel::actor::ActorImpl* receiver, const Mailbox* mbox, void* dst_buff, size_t* dst_buff_size, + const std::function& match_fun, + const std::function& copy_data_fun, + void* data, double timeout, double rate) +{ + xbt_assert(std::isfinite(timeout), "timeout is not finite!"); + xbt_assert(mbox, "No rendez-vous point defined for recv"); + + if (MC_is_active() || MC_record_replay_is_active()) { + /* the model-checker wants two separate simcalls, and wants comm to be nullptr during the simcall */ + simgrid::kernel::activity::ActivityImplPtr comm = nullptr; + + simgrid::kernel::actor::CommIrecvSimcall observer{receiver, + mbox->get_impl(), + static_cast(dst_buff), + dst_buff_size, + match_fun, + copy_data_fun, + data, + rate, + "Irecv"}; + comm = simgrid::kernel::actor::simcall_answered( + [&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); }, &observer); + + if (simgrid::kernel::actor::ActivityWaitSimcall wait_observer{receiver, comm.get(), timeout, "wait"}; + simgrid::kernel::actor::simcall_blocking( + [&wait_observer] { + wait_observer.get_activity()->wait_for(wait_observer.get_issuer(), wait_observer.get_timeout()); + }, + &wait_observer)) { + throw simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"); + } + comm = nullptr; + } else { + simgrid::kernel::actor::CommIrecvSimcall observer(receiver, mbox->get_impl(), static_cast(dst_buff), + dst_buff_size, match_fun, copy_data_fun, data, rate, "Irecv"); + simgrid::kernel::actor::simcall_blocking([&observer, timeout] { + simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::irecv(&observer); + comm->wait_for(observer.get_issuer(), timeout); + }); + } +} + +CommPtr Comm::sendto_init() { - std::vector rcomms(comms->size()); - std::transform(begin(*comms), end(*comms), begin(rcomms), - [](const CommPtr& comm) { return static_cast(comm->pimpl_.get()); }); - int changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout); - if (changed_pos != -1) - comms->at(changed_pos)->complete(State::FINISHED); - return changed_pos; + CommPtr res(new Comm()); + res->pimpl_ = kernel::activity::CommImplPtr(new kernel::activity::CommImpl()); + boost::static_pointer_cast(res->pimpl_)->detach(); + res->sender_ = kernel::actor::ActorImpl::self(); + return res; } -void Comm::wait_all(const std::vector* comms) +CommPtr Comm::sendto_init(Host* from, Host* to) { - // TODO: this should be a simcall or something - // TODO: we are missing a version with timeout - for (CommPtr comm : *comms) - comm->wait(); + auto res = Comm::sendto_init()->set_source(from)->set_destination(to); + res->set_state(State::STARTING); + return res; +} + +CommPtr Comm::sendto_async(Host* from, Host* to, uint64_t simulated_size_in_bytes) +{ + return Comm::sendto_init()->set_payload_size(simulated_size_in_bytes)->set_source(from)->set_destination(to); +} + +void Comm::sendto(Host* from, Host* to, uint64_t simulated_size_in_bytes) +{ + sendto_async(from, to, simulated_size_in_bytes)->wait(); +} + +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_)); + boost::static_pointer_cast(pimpl_)->set_source(from); + // Setting 'source' may allow to start the activity, let's try + if (state_ == State::STARTING && remains_ <= 0) + XBT_DEBUG("This communication has a payload size of 0 byte. It cannot start yet"); + else + start(); + + return this; +} +Host* Comm::get_source() const +{ + return pimpl_ ? boost::static_pointer_cast(pimpl_)->get_source() : nullptr; +} + +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_)); + boost::static_pointer_cast(pimpl_)->set_destination(to); + // Setting 'destination' may allow to start the activity, let's try + if (state_ == State::STARTING && remains_ <= 0) + XBT_DEBUG("This communication has a payload size of 0 byte. It cannot start yet"); + else + start(); + + return this; +} + +Host* Comm::get_destination() const +{ + return pimpl_ ? boost::static_pointer_cast(pimpl_)->get_destination() : nullptr; } CommPtr Comm::set_rate(double rate) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); rate_ = rate; return this; } +CommPtr Comm::set_mailbox(Mailbox* mailbox) +{ + xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", + __func__); + mailbox_ = mailbox; + return this; +} + CommPtr Comm::set_src_data(void* buff) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); src_buff_ = buff; return this; @@ -77,7 +239,7 @@ CommPtr Comm::set_src_data(void* buff) CommPtr Comm::set_src_data_size(size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); src_buff_size_ = size; return this; } @@ -85,7 +247,7 @@ CommPtr Comm::set_src_data_size(size_t size) CommPtr Comm::set_src_data(void* buff, size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); src_buff_ = buff; @@ -96,81 +258,112 @@ CommPtr Comm::set_src_data(void* buff, size_t size) CommPtr Comm::set_dst_data(void** buff) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dst_buff_ = buff; return this; } -void* Comm::get_dst_data() -{ - return dst_buff_; -} -size_t Comm::get_dst_data_size() const -{ - return dst_buff_size_; -} CommPtr Comm::set_dst_data(void** buff, size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dst_buff_ = buff; 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); + set_remaining(bytes); + if (pimpl_) { + boost::static_pointer_cast(pimpl_)->set_size(bytes); + } return this; } -CommPtr Comm::sendto_init(Host* from, Host* to) +void* Comm::get_payload() const { - CommPtr res(new Comm()); - res->from_ = from; - res->to_ = to; + xbt_assert(get_state() == State::FINISHED, + "You can only retrieve the payload of a communication that gracefully terminated, but its state is %s.", + get_state_str()); + return static_cast(pimpl_.get())->payload_; +} - return res; +Actor* Comm::get_sender() const +{ + kernel::actor::ActorImplPtr sender = nullptr; + if (pimpl_) + sender = boost::static_pointer_cast(pimpl_)->src_actor_; + return sender ? sender->get_ciface() : nullptr; } -CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes) +Actor* Comm::get_receiver() const { - auto res = Comm::sendto_init(from, to)->set_payload_size(simulated_size_in_bytes); - res->vetoable_start(); - return res; + kernel::actor::ActorImplPtr receiver = nullptr; + if (pimpl_) + receiver = boost::static_pointer_cast(pimpl_)->dst_actor_; + return receiver ? receiver->get_ciface() : nullptr; } -void Comm::sendto(Host* from, Host* to, double simulated_size_in_bytes) +bool Comm::is_assigned() const { - sendto_async(from, to, simulated_size_in_bytes)->wait(); + return (pimpl_ && boost::static_pointer_cast(pimpl_)->is_assigned()) || + mailbox_ != nullptr; } -Comm* Comm::start() +Comm* Comm::do_start() { xbt_assert(get_state() == State::INITED || get_state() == State::STARTING, - "You cannot use %s() once your communication started (not implemented)", __FUNCTION__); - if (from_ != nullptr || to_ != nullptr) { - xbt_assert(from_ != nullptr && to_ != nullptr, "When either from_ or to_ is specified, both must be."); + "You cannot use %s() once your communication started (not implemented)", __func__); + + auto myself = kernel::actor::ActorImpl::self(); + + if (get_source() != nullptr || get_destination() != nullptr) { + xbt_assert(is_assigned(), "When either from_ or to_ is specified, both must be."); xbt_assert(src_buff_ == nullptr && dst_buff_ == nullptr, "Direct host-to-host communications cannot carry any data."); - pimpl_ = kernel::actor::simcall([this] { - kernel::activity::CommImplPtr res(new kernel::activity::CommImpl(this->from_, this->to_, this->get_remaining())); - res->start(); - return res; + XBT_DEBUG("host-to-host Comm. Pimpl already created and set, just start it."); + kernel::actor::simcall_answered([this] { + pimpl_->set_state(kernel::activity::State::READY); + boost::static_pointer_cast(pimpl_)->start(); }); - - } else if (src_buff_ != nullptr) { // Sender side - on_start(*this, true /* is_sender*/); - 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 + fire_on_start(); + fire_on_this_start(); + } else if (myself == sender_) { + on_send(*this); + on_this_send(*this); + kernel::actor::CommIsendSimcall observer{sender_, + mailbox_->get_impl(), + remains_, + rate_, + static_cast(src_buff_), + src_buff_size_, + match_fun_, + clean_fun_, + copy_data_function_, + get_data(), + detached_, + "Isend"}; + pimpl_ = kernel::actor::simcall_answered([&observer] { return kernel::activity::CommImpl::isend(&observer); }, + &observer); + } else if (myself == receiver_) { xbt_assert(not detached_, "Receive cannot be detached"); - on_start(*this, false /*is_sender*/); - pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, - copy_data_function_, get_user_data(), rate_); - + on_recv(*this); + on_this_recv(*this); + kernel::actor::CommIrecvSimcall observer{receiver_, + mailbox_->get_impl(), + static_cast(dst_buff_), + &dst_buff_size_, + match_fun_, + copy_data_function_, + get_data(), + rate_, + "Irecv"}; + pimpl_ = kernel::actor::simcall_answered([&observer] { return kernel::activity::CommImpl::irecv(&observer); }, + &observer); } else { xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver"); } @@ -178,14 +371,45 @@ Comm* Comm::start() if (suspended_) pimpl_->suspend(); + if (not detached_) { + pimpl_->set_iface(this); + pimpl_->set_actor(sender_); + // Only throw the signal when both sides are here and the status is READY + if (pimpl_->get_state() != kernel::activity::State::WAITING) { + fire_on_start(); + fire_on_this_start(); + } + } + state_ = State::STARTED; return this; } -/** @brief Block the calling actor until the communication is finished */ -Comm* Comm::wait() +Comm* Comm::detach() { - return this->wait_for(-1); + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "You cannot use %s() once your communication is %s (not implemented)", __func__, get_state_str()); + xbt_assert(dst_buff_ == nullptr && dst_buff_size_ == 0, "You can only detach sends, not recvs"); + detached_ = true; + start(); + return this; +} + +ssize_t Comm::test_any(const std::vector& comms) // XBT_ATTRIB_DEPRECATED_v339 +{ + std::vector ractivities(comms.size()); + std::transform(begin(comms), end(comms), begin(ractivities), [](const CommPtr& act) { return act->pimpl_.get(); }); + + kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); + kernel::actor::ActivityTestanySimcall observer{issuer, ractivities, "test_any"}; + ssize_t changed_pos = kernel::actor::simcall_answered( + [&observer] { + return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); + }, + &observer); + if (changed_pos != -1) + comms.at(changed_pos)->complete(State::FINISHED); + return changed_pos; } /** @brief Block the calling actor until the communication is finished, or until timeout @@ -196,28 +420,44 @@ Comm* Comm::wait() * Negative values denote infinite wait times. 0 as a timeout returns immediately. */ Comm* Comm::wait_for(double timeout) { + XBT_DEBUG("Calling Comm::wait_for with state %s", get_state_str()); + kernel::actor::ActorImpl* issuer = nullptr; 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 + if (get_source() != nullptr || get_destination() != nullptr) { + return 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*/); - simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, - copy_data_function_, get_user_data(), timeout); + on_send(*this); + on_this_send(*this); + send(sender_, mailbox_, remains_, rate_, src_buff_, src_buff_size_, match_fun_, copy_data_function_, + get_data(), timeout); } else { // Receiver - on_start(*this, false /*is_sender*/); - simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, - get_user_data(), timeout, rate_); + on_recv(*this); + on_this_recv(*this); + recv(receiver_, mailbox_, dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, get_data(), + timeout, rate_); } break; - case State::STARTED: - simcall_comm_wait(get_impl(), timeout); + try { + issuer = kernel::actor::ActorImpl::self(); + kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout, "Wait"}; + if (kernel::actor::simcall_blocking( + [&observer] { observer.get_activity()->wait_for(observer.get_issuer(), observer.get_timeout()); }, + &observer)) { + throw TimeoutException(XBT_THROW_POINT, "Timeouted"); + } + } catch (const NetworkFailureException& e) { + issuer->simcall_.observer_ = nullptr; // Comm failed on network failure, reset the observer to nullptr + complete(State::FAILED); + e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); + } break; case State::CANCELED: @@ -230,71 +470,60 @@ Comm* Comm::wait_for(double timeout) return this; } -int Comm::test_any(const std::vector* comms) -{ - std::vector rcomms(comms->size()); - std::transform(begin(*comms), end(*comms), begin(rcomms), - [](const CommPtr& comm) { return static_cast(comm->pimpl_.get()); }); - int changed_pos = simcall_comm_testany(rcomms.data(), rcomms.size()); - if (changed_pos != -1) - comms->at(changed_pos)->complete(State::FINISHED); - return changed_pos; -} - -Comm* Comm::detach() +ssize_t Comm::deprecated_wait_any_for(const std::vector& comms, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { - xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication is %s (not implemented)", - __FUNCTION__, get_state_str()); - xbt_assert(dst_buff_ == nullptr && dst_buff_size_ == 0, "You can only detach sends, not recvs"); - detached_ = true; - vetoable_start(); - return this; + if (comms.empty()) + return -1; + ActivitySet set; + for (const auto& comm : comms) + set.push(comm); + try { + auto* ret = set.wait_any_for(timeout).get(); + for (size_t i = 0; i < comms.size(); i++) + if (comms[i].get() == ret) + return i; + + } catch (TimeoutException& e) { + return -1; + } catch (const NetworkFailureException& e) { + for (auto c : comms) + if (c->pimpl_->get_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."); + } + return -1; } -Comm* Comm::cancel() +void Comm::wait_all(const std::vector& comms) // XBT_ATTRIB_DEPRECATED_v339 { - kernel::actor::simcall([this] { - if (pimpl_) - boost::static_pointer_cast(pimpl_)->cancel(); - }); - complete(State::CANCELED); - return this; + // TODO: this should be a simcall or something + for (const auto& comm : comms) + comm->wait(); } -bool Comm::test() // TODO: merge with Activity::test, once modernized +size_t Comm::wait_all_for(const std::vector& comms, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { - xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING || - state_ == State::CANCELED || state_ == State::FINISHED); - - if (state_ == State::CANCELED || state_ == State::FINISHED) - return true; - - if (state_ == State::INITED || state_ == State::STARTING) - this->vetoable_start(); - - if (simcall_comm_test(get_impl())) { - complete(State::FINISHED); - return true; + if (timeout < 0.0) { + for (const auto& comm : comms) + comm->wait(); + return comms.size(); } - return false; -} -Mailbox* Comm::get_mailbox() const -{ - return mailbox_; -} + ActivitySet set; + for (auto comm : comms) + set.push(comm); + set.wait_all_for(timeout); -Actor* Comm::get_sender() const + return set.size(); +} +} // namespace simgrid::s4u +/* **************************** Public C interface *************************** */ +int sg_comm_isinstance(sg_activity_t acti) { - kernel::actor::ActorImplPtr sender = nullptr; - if (pimpl_) - sender = boost::static_pointer_cast(pimpl_)->src_actor_; - return sender ? sender->get_ciface() : nullptr; + return dynamic_cast(acti) != nullptr; } -} // namespace s4u -} // namespace simgrid -/* **************************** Public C interface *************************** */ void sg_comm_detach(sg_comm_t comm, void (*clean_function)(void*)) { comm->detach(clean_function); @@ -314,19 +543,7 @@ int sg_comm_test(sg_comm_t comm) sg_error_t sg_comm_wait(sg_comm_t comm) { - sg_error_t status = SG_OK; - - simgrid::s4u::CommPtr s4u_comm(comm, false); - try { - s4u_comm->wait_for(-1); - } catch (const simgrid::TimeoutException&) { - status = SG_ERROR_TIMEOUT; - } catch (const simgrid::CancelException&) { - status = SG_ERROR_CANCELED; - } catch (const simgrid::NetworkFailureException&) { - status = SG_ERROR_NETWORK; - } - return status; + return sg_comm_wait_for(comm, -1); } sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout) @@ -346,29 +563,38 @@ sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout) return status; } -void sg_comm_wait_all(sg_comm_t* comms, size_t count) +void sg_comm_wait_all(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { - std::vector s4u_comms; - for (unsigned int i = 0; i < count; i++) - s4u_comms.emplace_back(comms[i], false); + simgrid::s4u::ActivitySet as; + for (size_t i = 0; i < count; i++) + as.push(comms[i]); - simgrid::s4u::Comm::wait_all(&s4u_comms); + as.wait_all(); } -int sg_comm_wait_any(sg_comm_t* comms, size_t count) +ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { - return sg_comm_wait_any_for(comms, count, -1); + std::vector s4u_comms; + for (size_t i = 0; i < count; i++) + s4u_comms.emplace_back(comms[i], false); + + ssize_t pos = simgrid::s4u::Comm::deprecated_wait_any_for(s4u_comms, -1); + for (size_t i = 0; i < count; i++) { + if (pos != -1 && static_cast(pos) != i) + s4u_comms[i]->add_ref(); + } + return pos; } -int sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) +ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { std::vector s4u_comms; - for (unsigned int i = 0; i < count; i++) + for (size_t i = 0; i < count; i++) s4u_comms.emplace_back(comms[i], false); - int pos = simgrid::s4u::Comm::wait_any_for(&s4u_comms, timeout); - for (unsigned i = 0; i < count; i++) { - if (pos != -1 && static_cast(pos) != i) + ssize_t pos = simgrid::s4u::Comm::deprecated_wait_any_for(s4u_comms, timeout); + for (size_t i = 0; i < count; i++) { + if (pos != -1 && static_cast(pos) != i) s4u_comms[i]->add_ref(); } return pos;