X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5180d86a23e831c3a44ab8d40b90ce62395ed3c..83a986331633ba19391ce14e6605a5b423311ad7:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index b37d9ff045..8d981638af 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -1,13 +1,13 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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/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::get_name() const
 {
-  return pimpl_->name_;
+  return pimpl_->get_name();
+}
+
+const char* Mailbox::get_cname() const
+{
+  return pimpl_->get_cname();
 }
 
 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) */
@@ -76,30 +79,36 @@ CommPtr Mailbox::put_init()
 s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
 {
   s4u::CommPtr res = put_init();
-  res->setRemains(simulatedSize);
-  res->srcBuff_     = data;
-  res->srcBuffSize_ = sizeof(void*);
+  res->set_remaining(simulatedSize);
+  res->src_buff_      = data;
+  res->src_buff_size_ = sizeof(void*);
   return res;
 }
-s4u::CommPtr Mailbox::put_async(void* data, uint64_t 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, uint64_t simulatedSize)
 {
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
   CommPtr c = put_init();
-  c->setRemains(simulatedSize);
-  c->setSrcData(payload);
+  c->set_remaining(simulatedSize);
+  c->set_src_data(payload);
   c->wait();
 }
 /** Blocking send with 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);
+  c->set_remaining(simulatedSize);
+  c->set_src_data(payload);
   // c->start() is optional.
   c->wait(timeout);
 }
@@ -114,7 +123,7 @@ s4u::CommPtr Mailbox::get_init()
 s4u::CommPtr Mailbox::get_async(void** data)
 {
   s4u::CommPtr res = get_init();
-  res->setDstData(data, sizeof(*data));
+  res->set_dst_data(data, sizeof(*data));
   res->start();
   return res;
 }
@@ -123,7 +132,7 @@ void* Mailbox::get()
 {
   void* res = nullptr;
   CommPtr c = get_init();
-  c->setDstData(&res, sizeof(res));
+  c->set_dst_data(&res, sizeof(res));
   c->wait();
   return res;
 }
@@ -131,7 +140,7 @@ void* Mailbox::get(double timeout)
 {
   void* res = nullptr;
   CommPtr c = get_init();
-  c->setDstData(&res, sizeof(res));
+  c->set_dst_data(&res, sizeof(res));
   c->wait(timeout);
   return res;
 }