X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e9b70d3dc4bc81e7f13c923ba3e6a736395d963..544e6fac3fc91ae81d5daa4481562240c2cb2467:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index d7f48697dc..cff1a5f452 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -6,9 +6,8 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
+#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_network_private.h"
-#include "src/simix/smx_process_private.h"
-
 #include "simgrid/s4u/mailbox.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
@@ -21,30 +20,39 @@ const char *Mailbox::getName() {
   return pimpl_->name;
 }
 
-MailboxPtr Mailbox::byName(const char*name) {
+MailboxPtr Mailbox::byName(const char*name)
+{
   // FIXME: there is a race condition here where two actors run Mailbox::byName
   // on a non-existent mailbox during the same scheduling round. Both will be
   // interrupted in the simcall creating the underlying simix mbox.
   // Only one simix object will be created, but two S4U objects will be created.
   // Only one S4U object will be stored in the hashmap and used, and the other
   // one will be leaked.
-  smx_mailbox_t mbox = simcall_mbox_get_by_name(name);
+  smx_mailbox_t mbox = SIMIX_mbox_get_by_name(name);
   if (mbox == nullptr)
     mbox = simcall_mbox_create(name);
-  return MailboxPtr(&mbox->mbox_, true);
+  return MailboxPtr(&mbox->piface_, true);
+}
+
+bool Mailbox::empty()
+{
+  return pimpl_->comm_queue.empty();
 }
 
-bool Mailbox::empty() {
-  return nullptr == simcall_mbox_front(pimpl_);
+smx_activity_t Mailbox::front()
+{
+  return pimpl_->comm_queue.empty() ? nullptr : pimpl_->comm_queue.front();
 }
 
-void Mailbox::setReceiver(Actor* actor) {
+void Mailbox::setReceiver(ActorPtr actor) {
   simcall_mbox_set_receiver(pimpl_, actor == nullptr ? nullptr : actor->pimpl_);
 }
 
 /** @brief get the receiver (process associated to the mailbox) */
-Actor& Mailbox::receiver() {
-  return pimpl_->permanent_receiver->actor();
+ActorPtr Mailbox::receiver() {
+  if(pimpl_->permanent_receiver == nullptr)
+    return ActorPtr();
+  return ActorPtr(&pimpl_->permanent_receiver->getIface());
 }
 
 }
@@ -59,8 +67,5 @@ int sg_mbox_is_empty(sg_mbox_t mbox) {
   return mbox->empty();
 }
 void sg_mbox_setReceiver(sg_mbox_t mbox, smx_process_t process) {
-  mbox->setReceiver(&process->actor());
-}
-smx_process_t sg_mbox_receiver(sg_mbox_t mbox) {
-  return mbox->receiver().getInferior();
+  mbox->setReceiver(&process->getIface());
 }