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

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index c76a4d9ec2..f1b2f3ff3a 100644
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -6,9 +6,13 @@
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <boost/unordered_map.hpp>
+#include <xbt/base.h>
+#include <simgrid/s4u/forward.hpp>
 
-#include "simgrid/s4u/process.hpp"
+#ifdef __cplusplus
+
+# include <boost/unordered_map.hpp>
+#include <simgrid/s4u/actor.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -20,26 +24,46 @@ namespace s4u {
  * You can access any mailbox without any latency. The network delay are only related to the location of the
  * sender and receiver.
  */
-class Mailbox {
-	friend Process;
+XBT_PUBLIC_CLASS Mailbox {
+  friend Comm;
 
 private:
-	Mailbox(const char*name, smx_rdv_t inferior);
+  Mailbox(const char*name, smx_mailbox_t inferior);
 public:
-	~Mailbox();
-	
+  ~Mailbox();
+  
 protected:
-	smx_rdv_t getInferior() { return p_inferior; }
+  smx_mailbox_t getInferior() { return inferior_; }
 
 public:
-	/** Retrieve the mailbox associated to the given string */
-	static Mailbox *byName(const char *name);
+  /** Get the name of that mailbox */
+  const char *getName();
+  /** Retrieve the mailbox associated to the given string */
+  static Mailbox *byName(const char *name);
+  /** 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 p_name;
-	smx_rdv_t p_inferior;
-	static boost::unordered_map<std::string, Mailbox *> *channels;
+  std::string name_;
+  smx_mailbox_t inferior_;
+  static boost::unordered_map<std::string, Mailbox *> *mailboxes;
 };
 }} // 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);
+
 #endif /* SIMGRID_S4U_MAILBOX_HPP */