X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df9acac8643a570b52133a3011781adb0875519a..cabfcca7cb25b7aa54d7ee1b0a8b117940b85a8d:/include/simgrid/s4u/mailbox.hpp

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index 3d1b6abd2e..88f9b9856d 100644
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -6,12 +6,13 @@
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <xbt/base.h>
-#include <simgrid/s4u/forward.hpp>
+#include <string>
 
-#ifdef __cplusplus
+#include <boost/intrusive_ptr.hpp>
 
-# include <boost/unordered_map.hpp>
+#include <xbt/base.h>
+
+#include <simgrid/s4u/forward.hpp>
 #include <simgrid/s4u/actor.hpp>
 
 namespace simgrid {
@@ -26,20 +27,29 @@ namespace s4u {
  */
 XBT_PUBLIC_CLASS Mailbox {
   friend Comm;
+  friend simgrid::s4u::Engine;
+  friend simgrid::simix::Mailbox;
+
+  smx_mailbox_t pimpl_;
+
+  Mailbox(smx_mailbox_t mbox): pimpl_(mbox) {}
 
-private:
-  Mailbox(const char*name, smx_mailbox_t inferior);
-public:
-  ~Mailbox();
-  
 protected:
-  smx_mailbox_t getInferior() { return pimpl_; }
+  smx_mailbox_t getImpl() { return pimpl_; }
 
 public:
+
+  // We don't have to manage the lifetime of mailboxes:
+  friend void intrusive_ptr_add_ref(Mailbox*) {}
+  friend void intrusive_ptr_release(Mailbox*) {}
+  using Ptr = boost::intrusive_ptr<Mailbox>;
+
   /** Get the name of that mailbox */
   const char *getName();
+
   /** Retrieve the mailbox associated to the given string */
-  static Mailbox *byName(const char *name);
+  static Ptr byName(const char *name);
+
   /** Returns whether the mailbox contains queued communications */
   bool empty();
 
@@ -48,19 +58,15 @@ public:
    * 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(Actor* process);
 
-private:
-  std::string name_;
-  smx_mailbox_t pimpl_;
-  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++ */
+using MailboxPtr = Mailbox::Ptr;
+
+}} // namespace simgrid::s4u
 
 XBT_PUBLIC(sg_mbox_t) sg_mbox_by_name(const char*name);
 XBT_PUBLIC(int) sg_mbox_is_empty(sg_mbox_t mbox);