X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..c6095437348b2a76e6cd24e3e98c81ecd9b8164a:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 6f2602c31a..8548847e08 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -16,9 +16,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous commun namespace simgrid { namespace s4u { -xbt::signal Comm::on_sender_start; -xbt::signal Comm::on_receiver_start; -xbt::signal Comm::on_completion; +xbt::signal Comm::on_start; +xbt::signal Comm::on_completion; Comm::~Comm() { @@ -35,10 +34,10 @@ Comm::~Comm() int Comm::wait_any_for(const std::vector* comms, double timeout) { - auto rcomms = std::make_unique(comms->size()); - std::transform(begin(*comms), end(*comms), rcomms.get(), + 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.get(), comms->size(), timeout); + int changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout); if (changed_pos != -1) comms->at(changed_pos)->release_dependencies(); return changed_pos; @@ -96,10 +95,13 @@ CommPtr Comm::set_dst_data(void** buff) dst_buff_ = buff; return this; } +void* Comm::get_dst_data() +{ + return dst_buff_; +} size_t Comm::get_dst_data_size() const { - xbt_assert(state_ == State::FINISHED, "You cannot use %s before your communication terminated", __FUNCTION__); return dst_buff_size_; } CommPtr Comm::set_dst_data(void** buff, size_t size) @@ -113,25 +115,42 @@ CommPtr Comm::set_dst_data(void** buff, size_t size) return this; } -CommPtr Comm::set_tracing_category(const std::string& category) +CommPtr Comm::sendto_init(Host* from, Host* to) { - xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start"); - tracing_category_ = category; - return this; + CommPtr res(new Comm()); + res->from_ = from; + res->to_ = to; + + return res; +} +CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes) +{ + auto res = Comm::sendto_init(from, to); + res->set_remaining(simulated_size_in_bytes)->start(); + return res; } Comm* Comm::start() { xbt_assert(get_state() == State::INITED || get_state() == State::STARTING, "You cannot use %s() once your communication started (not implemented)", __FUNCTION__); - - if (src_buff_ != nullptr) { // Sender side - on_sender_start(*Actor::self()); + if (from_ != nullptr || to_ != nullptr) { + xbt_assert(from_ != nullptr && to_ != nullptr, "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] { + auto res = new kernel::activity::CommImpl(this->from_, this->to_, this->get_remaining()); + res->start(); + return res; + }); + + } 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 xbt_assert(not detached_, "Receive cannot be detached"); - on_receiver_start(*Actor::self()); + 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_); @@ -165,14 +184,16 @@ Comm* Comm::wait_for(double timeout) break; case State::INITED: - case State::STARTING: // It's not started yet. Do it in one simcall - if (src_buff_ != nullptr) { - on_sender_start(*Actor::self()); + 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 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); } else { // Receiver - on_receiver_start(*Actor::self()); + 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_); } @@ -182,7 +203,6 @@ Comm* Comm::wait_for(double timeout) case State::STARTED: simcall_comm_wait(get_impl(), timeout); - on_completion(*Actor::self()); state_ = State::FINISHED; this->release_dependencies(); break; @@ -193,15 +213,16 @@ Comm* Comm::wait_for(double timeout) default: THROW_IMPOSSIBLE; } + on_completion(*this); return this; } int Comm::test_any(const std::vector* comms) { - auto rcomms = std::make_unique(comms->size()); - std::transform(begin(*comms), end(*comms), rcomms.get(), + 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.get(), comms->size()); + int changed_pos = simcall_comm_testany(rcomms.data(), rcomms.size()); if (changed_pos != -1) comms->at(changed_pos)->release_dependencies(); return changed_pos; @@ -209,9 +230,9 @@ int Comm::test_any(const std::vector* comms) Comm* Comm::detach() { - xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); - xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs"); + 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;