API format unification

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

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index c87c380..ea2a108 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -6,10 +6,9 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
+#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_network_private.h"
-#include "src/simix/smx_process_private.h"
-
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
@@ -17,11 +16,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 namespace simgrid {
 namespace s4u {
 
-const char *Mailbox::getName() {
+const char *Mailbox::name() {
   return pimpl_->name;
 }
 
-MailboxPtr Mailbox::byName(const char*name) {
+MailboxPtr Mailbox::byName(const char*name)
+{
   // FIXME: there is a 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.
@@ -34,31 +34,31 @@ MailboxPtr Mailbox::byName(const char*name) {
   return MailboxPtr(&mbox->piface_, true);
 }
 
-bool Mailbox::empty() {
-  return nullptr == simcall_mbox_front(pimpl_);
+MailboxPtr Mailbox::byName(std::string name)
+{
+  return byName(name.c_str());
 }
 
-void Mailbox::setReceiver(Actor* actor) {
-  simcall_mbox_set_receiver(pimpl_, actor == nullptr ? nullptr : actor->pimpl_);
+bool Mailbox::empty()
+{
+  return pimpl_->comm_queue.empty();
 }
 
-/** @brief get the receiver (process associated to the mailbox) */
-ActorPtr Mailbox::receiver() {
-  if(pimpl_->permanent_receiver == nullptr) return ActorPtr();
-  return ActorPtr(&pimpl_->permanent_receiver->actor());
+smx_activity_t Mailbox::front()
+{
+  return pimpl_->comm_queue.empty() ? nullptr : pimpl_->comm_queue.front();
 }
 
+void Mailbox::setReceiver(ActorPtr actor) {
+  simcall_mbox_set_receiver(pimpl_, actor == nullptr ? nullptr : actor->pimpl_);
 }
-}
-
-/*------- C functions -------*/
 
-sg_mbox_t sg_mbox_by_name(const char*name){
-  return simgrid::s4u::Mailbox::byName(name).get();
+/** @brief get the receiver (process associated to the mailbox) */
+ActorPtr Mailbox::receiver() {
+  if(pimpl_->permanent_receiver == nullptr)
+    return ActorPtr();
+  return ActorPtr(&pimpl_->permanent_receiver->getIface());
 }
-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->actor());
 }