X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e..e167326c1369032305b7eb87e166b12d6690df64:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index d18150de28..c23816f714 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -5,39 +5,68 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/simix/smx_network_private.h"
 
 #include "simgrid/s4u/mailbox.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 
-
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
 
 boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
 
+Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
+  pimpl_ = inferior;
+  name_ = name;
+  mailboxes->insert({name, this});
+}
+const char *Mailbox::getName() {
+  return name_.c_str();
+}
+Mailbox *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 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_mbox_create(name));
+    res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
+  }
+  return res;
+}
+
+bool Mailbox::empty() {
+  return nullptr == simcall_mbox_front(pimpl_);
+}
+
+void Mailbox::setReceiver(smx_process_t process) {
+  simcall_mbox_set_receiver(pimpl_, process);
+}
+/** @brief get the receiver (process associated to the mailbox) */
+smx_process_t Mailbox::receiver() {
+  return pimpl_->permanent_receiver;
+}
+
+}
+}
+
+/*------- C functions -------*/
 
-s4u::Mailbox::Mailbox(const char*name, smx_rdv_t inferior) {
-	p_inferior = inferior;
-	p_name = name;
-	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.
-		// 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));
-		res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
-	}
-	return res;
+sg_mbox_t sg_mbox_by_name(const char*name){
+  return simgrid::s4u::Mailbox::byName(name);
+}
+int sg_mbox_is_empty(sg_mbox_t mbox) {
+  return mbox->empty();
+}
+void sg_mbox_setReceiver(sg_mbox_t mbox, smx_process_t process) {
+  mbox->setReceiver(process);
+}
+smx_process_t sg_mbox_receiver(sg_mbox_t mbox) {
+  return mbox->receiver();
 }