Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index 4ee1d81..3d1b6ab 100644 (file)
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -2,15 +2,16 @@
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
-#ifdef __cplusplus
 
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <boost/unordered_map.hpp>
-
 #include <xbt/base.h>
 #include <simgrid/s4u/forward.hpp>
+
+#ifdef __cplusplus
+
+# include <boost/unordered_map.hpp>
 #include <simgrid/s4u/actor.hpp>
 
 namespace simgrid {
@@ -32,7 +33,7 @@ public:
   ~Mailbox();
   
 protected:
-  smx_mailbox_t getInferior() { return inferior_; }
+  smx_mailbox_t getInferior() { return pimpl_; }
 
 public:
   /** Get the name of that mailbox */
@@ -42,10 +43,20 @@ public:
   /** Returns whether the mailbox contains queued communications */
   bool empty();
 
+  /** 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(smx_process_t process);
+  /** Return the process declared as permanent receiver, or nullptr if none **/
+  smx_process_t receiver();
+
 private:
   std::string name_;
-  smx_mailbox_t inferior_;
+  smx_mailbox_t pimpl_;
   static boost::unordered_map<std::string, Mailbox *> *mailboxes;
+  friend s4u::Engine;
 };
 }} // namespace simgrid::s4u
 
@@ -53,5 +64,7 @@ private:
 
 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 */