-/* 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 "simgrid/s4u/Comm.hpp"
-#include "simgrid/s4u/Mailbox.hpp"
-#include "src/kernel/activity/MailboxImpl.hpp"
-
#include <simgrid/mailbox.h>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Mailbox.hpp>
+
+#include "src/kernel/activity/MailboxImpl.hpp"
XBT_LOG_EXTERNAL_CATEGORY(s4u);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes");
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
-const xbt::string& Mailbox::get_name() const
+const std::string& Mailbox::get_name() const
{
return pimpl_->get_name();
}
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
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;
}
xbt_assert(payload != nullptr, "You cannot send nullptr");
CommPtr res = put_init(payload, simulated_size_in_bytes);
- res->vetoable_start();
+ res->start();
return res;
}
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
- put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait();
+ put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->start()->wait();
}
/** Blocking send with timeout */
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
- put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait_for(timeout);
+ put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->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;
}
kernel::activity::ActivityImplPtr
-Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
+Mailbox::iprobe(int type, const std::function<bool(void*, void*, kernel::activity::CommImpl*)>& match_fun, void* data)
+{
+ return kernel::actor::simcall_answered(
+ [this, type, &match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+}
+
+void Mailbox::clear()
{
- return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+ kernel::actor::simcall_answered([this]() { this->pimpl_->clear(true); });
}
-} // namespace s4u
-} // namespace simgrid
+
+} // namespace simgrid::s4u
/* **************************** Public C interface *************************** */
sg_mailbox_t sg_mailbox_by_name(const char* alias)