make s4u::Mailbox::setReceiver() working; add s4u::Actor::self()

[simgrid.git] / src / s4u / s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index fe40a3f..20a3bcf 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -21,30 +21,38 @@ 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->piface_, true);
 }
 
-bool Mailbox::empty() {
-  return nullptr == simcall_mbox_front(pimpl_);
+bool Mailbox::empty()
+{
+  return pimpl_->comm_queue.empty();
 }
 
-void Mailbox::setReceiver(Actor* actor) {
+smx_synchro_t Mailbox::front()
+{
+  return pimpl_->comm_queue.empty() ? nullptr : pimpl_->comm_queue.front();
+}
+
+void Mailbox::setReceiver(ActorPtr actor) {
   simcall_mbox_set_receiver(pimpl_, actor == nullptr ? nullptr : actor->pimpl_);
 }
 
 /** @brief get the receiver (process associated to the mailbox) */
 ActorPtr Mailbox::receiver() {
-  if(pimpl_->permanent_receiver == nullptr) return ActorPtr();
+  if(pimpl_->permanent_receiver == nullptr)
+    return ActorPtr();
   return ActorPtr(&pimpl_->permanent_receiver->actor());
 }
 
@@ -62,6 +70,3 @@ int sg_mbox_is_empty(sg_mbox_t mbox) {
 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()->getImpl();
-}