[s4u] add Actor::getPPid and this_actor::getPPid()

[simgrid.git] / include / simgrid / s4u / mailbox.hpp

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index 4238ecf..99f65b4 100644 (file)
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -13,7 +13,7 @@
 #include <xbt/base.h>
 
 #include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/actor.hpp>
+#include <simgrid/s4u/Actor.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -30,14 +30,12 @@ XBT_PUBLIC_CLASS Mailbox {
   friend simgrid::s4u::Engine;
   friend simgrid::simix::Mailbox;
 
-  smx_mailbox_t pimpl_;
+  simgrid::simix::Mailbox *pimpl_;
 
   Mailbox(smx_mailbox_t mbox): pimpl_(mbox) {}
 
-protected:
-  smx_mailbox_t getInferior() { return pimpl_; }
-
 public:
+  smx_mailbox_t getImpl() { return pimpl_; } // FIXME: make me protected
 
   // We don't have to manage the lifetime of mailboxes:
   friend void intrusive_ptr_add_ref(Mailbox*) {}
@@ -53,15 +51,18 @@ public:
   /** Returns whether the mailbox contains queued communications */
   bool empty();
 
+  /** Returns the first element in the queue, or nullptr if none is there */
+  smx_activity_t front();
+
   /** Declare that the specified process is a permanent receiver on that mailbox
    *
    * It means that the communications sent to this mailbox will start flowing to its host even before he does a recv().
    * This models the real behavior of TCP and MPI communications, amongst other.
    */
-  void setReceiver(Actor* process);
+  void setReceiver(ActorPtr process);
 
   /** Return the process declared as permanent receiver, or nullptr if none **/
-  Actor& receiver();
+  ActorPtr receiver();
 };
 
 using MailboxPtr = Mailbox::Ptr;
@@ -71,6 +72,5 @@ using MailboxPtr = Mailbox::Ptr;
 XBT_PUBLIC(sg_mbox_t) sg_mbox_by_name(const char*name);
 XBT_PUBLIC(int) sg_mbox_is_empty(sg_mbox_t mbox);
 XBT_PUBLIC(void)sg_mbox_setReceiver(sg_mbox_t mbox, smx_process_t process);
-XBT_PUBLIC(smx_process_t) sg_mbox_receiver(sg_mbox_t mbox);
 
 #endif /* SIMGRID_S4U_MAILBOX_HPP */