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

[simgrid.git] / src / s4u / s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 6e497d8..f266128 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -6,6 +6,7 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"

+#include "src/simix/smx_network_private.h"

 
 #include "simgrid/s4u/mailbox.hpp"
 
 
 #include "simgrid/s4u/mailbox.hpp"
 


@@ -19,9 +20,13 @@ boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = ne
 
 
 s4u::Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
 
 
 s4u::Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {

-  inferior_ = inferior;
+  pimpl_ = inferior;
+  name_ = name;

   mailboxes->insert({name, this});
 }
   mailboxes->insert({name, this});
 }

+const char *s4u::Mailbox::getName() {
+  return name_.c_str();
+}

 s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
   s4u::Mailbox *res;
   try {
 s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
   s4u::Mailbox *res;
   try {


@@ -38,12 +43,28 @@ s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
 }
 
 bool s4u::Mailbox::empty() {
 }
 
 bool s4u::Mailbox::empty() {

-  return nullptr == simcall_mbox_get_head(inferior_);
+  return nullptr == simcall_mbox_front(pimpl_);
+}
+
+void s4u::Mailbox::setReceiver(smx_process_t process) {
+  simcall_mbox_set_receiver(pimpl_, process);
+}
+/** @brief get the receiver (process associated to the mailbox) */
+smx_process_t s4u::Mailbox::receiver() {
+  return pimpl_->permanent_receiver;

 }
 
 }
 

+/*------- C functions -------*/
+

 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();
 }
 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();
 }

+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();
+}