populate s4u::mailbox

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

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index a2311c7..2a75091 100644 (file)
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -3,6 +3,8 @@
 /* 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
 
@@ -26,24 +28,28 @@ 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();
   
 protected:
-  smx_rdv_t getInferior() { return p_inferior; }
+  smx_mailbox_t getInferior() { return inferior_; }
 
 public:
-  /** 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();
 
 private:
-  std::string p_name;
-  smx_rdv_t p_inferior;
+  smx_mailbox_t inferior_;
   static boost::unordered_map<std::string, Mailbox *> *mailboxes;
 };
 }} // namespace simgrid::s4u
 
+#endif
+
+XBT_PUBLIC(sg_mbox_t) sg_mbox_by_name(const char*name);
+XBT_PUBLIC(int) sg_mbox_is_empty(sg_mbox_t mbox);
+
 #endif /* SIMGRID_S4U_MAILBOX_HPP */