X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..d105f94a1512ae0528178dc4292b7d421ae3c039:/src/s4u/s4u_Mailbox.cpp

diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index 9739967c90..2fcd87fe55 100644
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -1,9 +1,10 @@
-/* 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. */
 
 #include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/MailboxImpl.hpp"
 
@@ -27,21 +28,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,18 +58,18 @@ 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()->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()->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)
@@ -78,9 +80,9 @@ void Mailbox::set_receiver(ActorPtr 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()
@@ -91,13 +93,9 @@ CommPtr Mailbox::put_init()
   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,26 +106,20 @@ 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()
@@ -138,33 +130,6 @@ CommPtr Mailbox::get_init()
   return res;
 }
 
-CommPtr Mailbox::get_async(void** data)
-{
-  CommPtr res = get_init();
-  res->set_dst_data(data, sizeof(*data));
-  res->vetoable_start();
-  return res;
-}
-
-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;
-}
-
 kernel::activity::ActivityImplPtr
 Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
 {
@@ -210,12 +175,12 @@ int sg_mailbox_listen(const char* alias)
 
 void* sg_mailbox_get(sg_mailbox_t mailbox)
 {
-  return mailbox->get();
+  return mailbox->get<void>();
 }
 
 sg_comm_t sg_mailbox_get_async(sg_mailbox_t mailbox, void** data)
 {
-  auto comm = mailbox->get_async(data);
+  auto comm = mailbox->get_async<void>(data);
   comm->add_ref();
   return comm.get();
 }