X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2455643f96166346bf10d16ddc289cc44f1fe78a..ccc3b6ac54d65bf59be965f90ea657deea9bafa8:/include/simgrid/s4u/mailbox.hpp?ds=sidebyside

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index aa5f3278de..88206d6328 100644
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -6,13 +6,12 @@
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <xbt/base.h>
-#include <simgrid/s4u/forward.hpp>
+#include <string>
 
-#ifdef __cplusplus
+#include <xbt/base.h>
 
-# include <boost/unordered_map.hpp>
-#include <simgrid/s4u/actor.hpp>
+#include <simgrid/s4u/forward.hpp>
+#include <simgrid/s4u/Actor.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -26,45 +25,47 @@ namespace s4u {
  */
 XBT_PUBLIC_CLASS Mailbox {
   friend Comm;
+  friend simgrid::s4u::Engine;
+  friend simgrid::simix::Mailbox;
 
-private:
-  Mailbox(const char*name, smx_mailbox_t inferior);
-public:
-  ~Mailbox();
-  
-protected:
-  smx_mailbox_t getInferior() { return inferior_; }
+  simgrid::simix::Mailbox *pimpl_;
 
+  Mailbox(smx_mailbox_t mbox): pimpl_(mbox) {}
+
+  // We don't have to manage the lifetime of mailboxes:
+  friend void intrusive_ptr_add_ref(Mailbox*) {}
+  friend void intrusive_ptr_release(Mailbox*) {}
 public:
+  smx_mailbox_t getImpl() { return pimpl_; } // FIXME: make me protected
+
+
   /** Get the name of that mailbox */
   const char *getName();
-  /** Retrieve the mailbox associated to the given string */
-  static Mailbox *byName(const char *name);
+
+  /** Retrieve the mailbox associated to the given string (as a C string) */
+  static MailboxPtr byName(const char *name);
+
+  /** Retrieve the mailbox associated to the given string (as a C++ string) */
+  static MailboxPtr byName(std::string name);
+
   /** 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.
+   * 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(smx_process_t process);
-  /** Return the process declared as permanent receiver, or nullptr if none **/
-  smx_process_t receiver();
+  void setReceiver(ActorPtr process);
 
-private:
-  std::string name_;
-  smx_mailbox_t inferior_;
-  static boost::unordered_map<std::string, Mailbox *> *mailboxes;
-  friend s4u::Engine;
+  /** Return the process declared as permanent receiver, or nullptr if none **/
+  ActorPtr receiver();
 };
-}} // namespace simgrid::s4u
 
-#endif /* C++ */
-
-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);
+}} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_MAILBOX_HPP */