X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db5adf7439201fb67d1d697b86806d58ace9fe85..fff9fbf510e8ac37ddb3bb622453d8b598806adf:/src/s4u/s4u_Mailbox.cpp diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 9739967c90..d692395a97 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -1,13 +1,13 @@ -/* Copyright (c) 2006-2020. 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 "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Mailbox.hpp" -#include "src/kernel/activity/MailboxImpl.hpp" - #include +#include +#include + +#include "src/kernel/activity/MailboxImpl.hpp" XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes"); @@ -27,21 +27,22 @@ const char* Mailbox::get_cname() const Mailbox* Mailbox::by_name(const std::string& name) { - kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name); - if (mbox == nullptr) { - mbox = kernel::actor::simcall([&name] { return kernel::activity::MailboxImpl::by_name_or_create(name); }); - } - return &mbox->piface_; + return Engine::get_instance()->mailbox_by_name_or_create(name); } bool Mailbox::empty() const { - return pimpl_->comm_queue_.empty(); + return pimpl_->empty(); +} + +size_t Mailbox::size() const +{ + return pimpl_->size(); } bool Mailbox::listen() const { - return not this->empty() || (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()); + return not pimpl_->empty() || (pimpl_->is_permanent() && pimpl_->has_some_done_comm()); } aid_t Mailbox::listen_from() const @@ -56,48 +57,44 @@ aid_t Mailbox::listen_from() const bool Mailbox::ready() const { bool comm_ready = false; - if (not pimpl_->comm_queue_.empty()) { - comm_ready = pimpl_->comm_queue_.front()->state_ == kernel::activity::State::DONE; + if (not pimpl_->empty()) { + comm_ready = pimpl_->front()->get_state() == kernel::activity::State::DONE; - } else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) { - comm_ready = pimpl_->done_comm_queue_.front()->state_ == kernel::activity::State::DONE; + } else if (pimpl_->is_permanent() && pimpl_->has_some_done_comm()) { + comm_ready = pimpl_->done_front()->get_state() == kernel::activity::State::DONE; } return comm_ready; } kernel::activity::CommImplPtr Mailbox::front() const { - return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front(); + return pimpl_->empty() ? nullptr : pimpl_->front(); } void Mailbox::set_receiver(ActorPtr actor) { - kernel::actor::simcall([this, actor]() { this->pimpl_->set_receiver(actor); }); + kernel::actor::simcall_answered([this, actor]() { this->pimpl_->set_receiver(actor); }); } /** @brief get the receiver (process associated to the mailbox) */ ActorPtr Mailbox::get_receiver() const { - if (pimpl_->permanent_receiver_ == nullptr) + if (pimpl_->is_permanent()) return ActorPtr(); - return pimpl_->permanent_receiver_->get_iface(); + return pimpl_->get_permanent_receiver()->get_iface(); } CommPtr Mailbox::put_init() { CommPtr res(new Comm()); res->sender_ = kernel::actor::ActorImpl::self(); - res->mailbox_ = this; + res->set_mailbox(this); return res; } -CommPtr Mailbox::put_init(void* data, uint64_t simulated_size_in_bytes) +CommPtr Mailbox::put_init(void* payload, uint64_t simulated_size_in_bytes) { - CommPtr res = put_init(); - res->set_remaining(simulated_size_in_bytes); - res->src_buff_ = data; - res->src_buff_size_ = sizeof(void*); - return res; + return put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->set_src_data_size(sizeof(void*)); } CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes) @@ -108,68 +105,40 @@ CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes) res->vetoable_start(); return res; } + void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes) { xbt_assert(payload != nullptr, "You cannot send nullptr"); - CommPtr c = put_init(); - c->set_remaining(simulated_size_in_bytes); - c->set_src_data(payload); - c->vetoable_start(); - c->wait(); + put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait(); } + /** Blocking send with timeout */ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeout) { xbt_assert(payload != nullptr, "You cannot send nullptr"); - CommPtr c = put_init(); - c->set_remaining(simulated_size_in_bytes); - c->set_src_data(payload); - c->vetoable_start(); - c->wait_for(timeout); + put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait_for(timeout); } CommPtr Mailbox::get_init() { - CommPtr res(new Comm()); + auto res = CommPtr(new Comm())->set_mailbox(this); res->receiver_ = kernel::actor::ActorImpl::self(); - res->mailbox_ = this; return res; } -CommPtr Mailbox::get_async(void** data) +kernel::activity::ActivityImplPtr +Mailbox::iprobe(int type, const std::function& match_fun, void* data) { - CommPtr res = get_init(); - res->set_dst_data(data, sizeof(*data)); - res->vetoable_start(); - return res; + return kernel::actor::simcall_answered( + [this, type, &match_fun, data] { return pimpl_->iprobe(type, match_fun, data); }); } -void* Mailbox::get() -{ - void* res = nullptr; - CommPtr c = get_init(); - c->set_dst_data(&res, sizeof(res)); - c->vetoable_start(); - c->wait(); - return res; -} -void* Mailbox::get(double timeout) -{ - void* res = nullptr; - CommPtr c = get_init(); - c->set_dst_data(&res, sizeof(res)); - c->vetoable_start(); - c->wait_for(timeout); - return res; +void Mailbox::clear() { + pimpl_->clear(); } -kernel::activity::ActivityImplPtr -Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data) -{ - return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); }); -} } // namespace s4u } // namespace simgrid @@ -210,12 +179,12 @@ int sg_mailbox_listen(const char* alias) void* sg_mailbox_get(sg_mailbox_t mailbox) { - return mailbox->get(); + return mailbox->get(); } sg_comm_t sg_mailbox_get_async(sg_mailbox_t mailbox, void** data) { - auto comm = mailbox->get_async(data); + auto comm = mailbox->get_async(data); comm->add_ref(); return comm.get(); }