add the Storage::read_async and Storage::write_async methods

[simgrid.git] / src / kernel / activity / MailboxImpl.cpp

diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp
index ebf615e..2a1d9d0 100644 (file)
--- a/src/kernel/activity/MailboxImpl.cpp
+++ b/src/kernel/activity/MailboxImpl.cpp
@@ -25,7 +25,7 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 /** @brief Returns the mailbox of that name, or nullptr */
-MailboxImpl* MailboxImpl::byNameOrNull(std::string name)
+MailboxImpl* MailboxImpl::by_name_or_null(std::string name)
 {
   auto mbox = mailboxes->find(name);
   if (mbox != mailboxes->end())
@@ -34,7 +34,7 @@ MailboxImpl* MailboxImpl::byNameOrNull(std::string name)
     return nullptr;
 }
 /** @brief Returns the mailbox of that name, newly created on need */
-MailboxImpl* MailboxImpl::byNameOrCreate(std::string name)
+MailboxImpl* MailboxImpl::by_name_or_create(std::string name)
 {
   /* two processes may have pushed the same mbox_create simcall at the same time */
   auto m = mailboxes->find(name);
@@ -47,14 +47,14 @@ MailboxImpl* MailboxImpl::byNameOrCreate(std::string name)
     return m->second;
 }
 /** @brief set the receiver of the mailbox to allow eager sends
- *  \param actor The receiving dude
+ *  @param actor The receiving dude
  */
-void MailboxImpl::setReceiver(s4u::ActorPtr actor)
+void MailboxImpl::set_receiver(s4u::ActorPtr actor)
 {
   if (actor != nullptr)
-    this->permanent_receiver = actor.get()->get_impl();
+    this->permanent_receiver_ = actor->get_impl();
   else
-    this->permanent_receiver = nullptr;
+    this->permanent_receiver_ = nullptr;
 }
 /** @brief Pushes a communication activity into a mailbox
  *  @param comm What to add
@@ -62,7 +62,7 @@ void MailboxImpl::setReceiver(s4u::ActorPtr actor)
 void MailboxImpl::push(activity::CommImplPtr comm)
 {
   comm->mbox = this;
-  this->comm_queue.push_back(std::move(comm));
+  this->comm_queue_.push_back(std::move(comm));
 }
 
 /** @brief Removes a communication activity from a mailbox
@@ -76,9 +76,9 @@ void MailboxImpl::remove(smx_activity_t activity)
   xbt_assert(comm->mbox == this, "Comm %p is in mailbox %s, not mailbox %s", comm.get(),
              (comm->mbox ? comm->mbox->get_cname() : "(null)"), this->get_cname());
   comm->mbox = nullptr;
-  for (auto it = this->comm_queue.begin(); it != this->comm_queue.end(); it++)
+  for (auto it = this->comm_queue_.begin(); it != this->comm_queue_.end(); it++)
     if (*it == comm) {
-      this->comm_queue.erase(it);
+      this->comm_queue_.erase(it);
       return;
     }
   xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname());