X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6680e6504535d7e92bb13cc50c5be364ac7060d6..c0b8dc9ae897f80d33a06914a4c0e14d20c7fe36:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index cd5b32136d..32ab0bb99c 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,9 +16,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 namespace simgrid {
 namespace s4u {
 
-const char* Mailbox::getName()
+const simgrid::xbt::string& Mailbox::getName() const
 {
-  return pimpl_->name_;
+  return pimpl_->getName();
+}
+
+const char* Mailbox::getCname() const
+{
+  return pimpl_->getCname();
 }
 
 MailboxPtr Mailbox::byName(const char*name)
@@ -53,9 +58,7 @@ 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) */
@@ -73,7 +76,7 @@ CommPtr Mailbox::put_init()
   res->mailbox_ = this;
   return res;
 }
-s4u::CommPtr Mailbox::put_init(void* data, double simulatedSize)
+s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
 {
   s4u::CommPtr res = put_init();
   res->setRemains(simulatedSize);
@@ -81,22 +84,28 @@ s4u::CommPtr Mailbox::put_init(void* data, double simulatedSize)
   res->srcBuffSize_ = sizeof(void*);
   return res;
 }
-s4u::CommPtr Mailbox::put_async(void* data, double simulatedSize)
+s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize)
 {
-  s4u::CommPtr res = put_init(data, simulatedSize);
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
+  s4u::CommPtr res = put_init(payload, simulatedSize);
   res->start();
   return res;
 }
-void Mailbox::put(void* payload, double simulatedSize)
+void Mailbox::put(void* payload, uint64_t simulatedSize)
 {
+  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::put(void* payload, double simulatedSize, double timeout)
+void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout)
 {
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
   CommPtr c = put_init();
   c->setRemains(simulatedSize);
   c->setSrcData(payload);