X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/14df1b2b0538cba0da86ce62f01863d7d2c156c0..3fafdab4bb94b48cb16c80690408a18f472e202b:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index cff5e622ad..dcacfd0b3e 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -1,30 +1,28 @@ -/* Copyright (c) 2006-2022. 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 #include #include #include #include #include +#include "mc/mc.h" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" +#include "src/mc/mc_replay.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous communications"); -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { xbt::signal Comm::on_send; xbt::signal Comm::on_recv; -xbt::signal Comm::on_completion; -CommPtr Comm::set_copy_data_callback(void (*callback)(kernel::activity::CommImpl*, void*, size_t)) +CommPtr Comm::set_copy_data_callback(const std::function& callback) { copy_data_function_ = callback; return this; @@ -34,8 +32,8 @@ void Comm::copy_buffer_callback(kernel::activity::CommImpl* comm, void* buff, si { 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->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; } @@ -60,6 +58,91 @@ Comm::~Comm() } } +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}; + 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}; + 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); + 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}; + 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}; + 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); + 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() { CommPtr res(new Comm()); @@ -95,7 +178,7 @@ CommPtr Comm::set_source(Host* from) if (state_ == State::STARTING && remains_ <= 0) XBT_DEBUG("This communication has a payload size of 0 byte. It cannot start yet"); else - vetoable_start(); + start(); return this; } @@ -113,7 +196,7 @@ CommPtr Comm::set_destination(Host* to) if (state_ == State::STARTING && remains_ <= 0) XBT_DEBUG("This communication has a payload size of 0 byte. It cannot start yet"); else - vetoable_start(); + start(); return this; } @@ -189,7 +272,7 @@ CommPtr Comm::set_dst_data(void** buff, size_t size) 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); } @@ -210,7 +293,7 @@ bool Comm::is_assigned() const 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__); @@ -273,7 +356,7 @@ Comm* Comm::detach() "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(); + start(); return this; } @@ -303,16 +386,16 @@ Comm* Comm::wait_for(double timeout) case State::INITED: case State::STARTING: // It's not started yet. Do it in one simcall if it's a regular communication if (get_source() != nullptr || get_destination() != nullptr) { - return vetoable_start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls + return start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls } else if (src_buff_ != nullptr) { on_send(*this); - simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, - copy_data_function_, get_data(), timeout); + send(sender_, mailbox_, remains_, rate_, src_buff_, src_buff_size_, match_fun_, copy_data_function_, + get_data(), timeout); } else { // Receiver on_recv(*this); - simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, - get_data(), timeout, rate_); + recv(receiver_, mailbox_, dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, get_data(), + timeout, rate_); } break; case State::STARTED: @@ -388,8 +471,7 @@ size_t Comm::wait_all_for(const std::vector& comms, double timeout) } return comms.size(); } -} // namespace s4u -} // namespace simgrid +} // namespace simgrid::s4u /* **************************** Public C interface *************************** */ void sg_comm_detach(sg_comm_t comm, void (*clean_function)(void*)) {