X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..f2236ed8987d2350cba5d839b6420e53968b6225:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 587a72aad6..6e497d85be 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -6,7 +6,6 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
-#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/mailbox.hpp"
 
@@ -19,25 +18,32 @@ using namespace simgrid;
 boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
 
 
-s4u::Mailbox::Mailbox(const char*name, smx_rdv_t inferior) {
-  p_inferior = inferior;
-  p_name = name;
+s4u::Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
+  inferior_ = inferior;
   mailboxes->insert({name, this});
 }
-const char *s4u::Mailbox::getName() {
-  return p_name.c_str();
-}
 s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
   s4u::Mailbox *res;
   try {
     res = mailboxes->at(name);
   } catch (std::out_of_range& e) {
     // FIXME: there is a potential race condition here where two actors run Mailbox::byName on a non-existent mailbox
-    // during the same scheduling round. Both will be interrupted in the simcall creating the underlying simix rdv.
+    // during the same scheduling round. Both will be interrupted in the simcall creating the underlying simix mbox.
     // Only one simix object will be created, but two S4U objects will be created.
     // Only one S4U object will be stored in the hashmap and used, and the other one will be leaked.
-    new Mailbox(name,simcall_rdv_create(name));
+    new Mailbox(name,simcall_mbox_create(name));
     res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
   }
   return res;
 }
+
+bool s4u::Mailbox::empty() {
+  return nullptr == simcall_mbox_get_head(inferior_);
+}
+
+sg_mbox_t sg_mbox_by_name(const char*name){
+  return s4u::Mailbox::byName(name);
+}
+int sg_mbox_is_empty(sg_mbox_t mbox) {
+  return mbox->empty();
+}