X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2455643f96166346bf10d16ddc289cc44f1fe78a..e167326c1369032305b7eb87e166b12d6690df64:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index ace9d8cf2c..c23816f714 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -6,27 +6,27 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
+#include "src/simix/smx_network_private.h"
 
 #include "simgrid/s4u/mailbox.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 
-
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
 
 boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
 
-
-s4u::Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
-  inferior_ = inferior;
+Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
+  pimpl_ = inferior;
   name_ = name;
   mailboxes->insert({name, this});
 }
-const char *s4u::Mailbox::getName() {
+const char *Mailbox::getName() {
   return name_.c_str();
 }
-s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
+Mailbox *Mailbox::byName(const char*name) {
   s4u::Mailbox *res;
   try {
     res = mailboxes->at(name);
@@ -41,21 +41,25 @@ s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
   return res;
 }
 
-bool s4u::Mailbox::empty() {
-  return nullptr == simcall_mbox_get_head(inferior_);
+bool Mailbox::empty() {
+  return nullptr == simcall_mbox_front(pimpl_);
+}
+
+void Mailbox::setReceiver(smx_process_t process) {
+  simcall_mbox_set_receiver(pimpl_, process);
+}
+/** @brief get the receiver (process associated to the mailbox) */
+smx_process_t Mailbox::receiver() {
+  return pimpl_->permanent_receiver;
 }
 
-void s4u::Mailbox::setReceiver(smx_process_t process) {
-  simcall_mbox_set_receiver(inferior_, process);
 }
-smx_process_t s4u::Mailbox::receiver() {
-  return simcall_mbox_get_receiver(inferior_);
 }
 
 /*------- C functions -------*/
 
 sg_mbox_t sg_mbox_by_name(const char*name){
-  return s4u::Mailbox::byName(name);
+  return simgrid::s4u::Mailbox::byName(name);
 }
 int sg_mbox_is_empty(sg_mbox_t mbox) {
   return mbox->empty();