X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3368ca8f8b3fb922a94a217f0afc3243ae18c8f5..9caf173e476622d309cc5653a83d224d05787cc7:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 9642de0274..92a03fcb65 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -5,9 +5,9 @@
 
 #include "simgrid/s4u/Comm.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_network_private.h"
+#include "src/simix/smx_network_private.hpp"
 #include "xbt/log.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
@@ -16,8 +16,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 namespace simgrid {
 namespace s4u {
 
-const char *Mailbox::name() {
-  return pimpl_->name_;
+const simgrid::xbt::string& Mailbox::get_name() const
+{
+  return pimpl_->get_name();
+}
+
+const char* Mailbox::get_cname() const
+{
+  return pimpl_->get_cname();
 }
 
 MailboxPtr Mailbox::byName(const char*name)
@@ -52,83 +58,88 @@ smx_activity_t Mailbox::front()
 }
 
 void Mailbox::setReceiver(ActorPtr actor) {
-  simix::kernelImmediate([this, actor]() {
-    this->pimpl_->setReceiver(actor);
-  });
+  simix::kernelImmediate([this, actor]() { this->pimpl_->setReceiver(actor); });
 }
 
 /** @brief get the receiver (process associated to the mailbox) */
-ActorPtr Mailbox::receiver() {
+ActorPtr Mailbox::getReceiver()
+{
   if (pimpl_->permanent_receiver == nullptr)
     return ActorPtr();
   return pimpl_->permanent_receiver->iface();
 }
 
-CommPtr Mailbox::send_init()
+CommPtr Mailbox::put_init()
 {
   CommPtr res   = CommPtr(new s4u::Comm());
   res->sender_  = SIMIX_process_self();
   res->mailbox_ = this;
   return res;
 }
-s4u::CommPtr Mailbox::send_init(void* data, int simulatedSize)
+s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
 {
-  s4u::CommPtr res = send_init();
+  s4u::CommPtr res = put_init();
   res->setRemains(simulatedSize);
   res->srcBuff_     = data;
   res->srcBuffSize_ = sizeof(void*);
   return res;
 }
-s4u::CommPtr Mailbox::send_async(void* data, int simulatedSize)
+s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize)
 {
-  s4u::CommPtr res = send_init(data, simulatedSize);
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
+  s4u::CommPtr res = put_init(payload, simulatedSize);
   res->start();
   return res;
 }
-void Mailbox::send(void* payload, double simulatedSize)
+void Mailbox::put(void* payload, uint64_t simulatedSize)
 {
-  CommPtr c = send_init();
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
+  CommPtr c = put_init();
   c->setRemains(simulatedSize);
   c->setSrcData(payload);
   c->wait();
 }
 /** Blocking send with timeout */
-void Mailbox::send(void* payload, double simulatedSize, double timeout)
+void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout)
 {
-  CommPtr c = send_init();
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
+  CommPtr c = put_init();
   c->setRemains(simulatedSize);
   c->setSrcData(payload);
   // c->start() is optional.
   c->wait(timeout);
 }
 
-s4u::CommPtr Mailbox::recv_init()
+s4u::CommPtr Mailbox::get_init()
 {
   CommPtr res    = CommPtr(new s4u::Comm());
   res->receiver_ = SIMIX_process_self();
   res->mailbox_  = this;
   return res;
 }
-s4u::CommPtr Mailbox::recv_async(void** data)
+s4u::CommPtr Mailbox::get_async(void** data)
 {
-  s4u::CommPtr res = recv_init();
+  s4u::CommPtr res = get_init();
   res->setDstData(data, sizeof(*data));
   res->start();
   return res;
 }
 
-void* Mailbox::recv()
+void* Mailbox::get()
 {
   void* res = nullptr;
-  CommPtr c = recv_init();
+  CommPtr c = get_init();
   c->setDstData(&res, sizeof(res));
   c->wait();
   return res;
 }
-void* Mailbox::recv(double timeout)
+void* Mailbox::get(double timeout)
 {
   void* res = nullptr;
-  CommPtr c = recv_init();
+  CommPtr c = get_init();
   c->setDstData(&res, sizeof(res));
   c->wait(timeout);
   return res;