X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..ea66702ca647cf2e57f4680aa88f8e0eda6011bc:/src/kernel/activity/MailboxImpl.cpp diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp index 06060f4299..8c66d352d1 100644 --- a/src/kernel/activity/MailboxImpl.cpp +++ b/src/kernel/activity/MailboxImpl.cpp @@ -4,7 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/activity/MailboxImpl.hpp" -#include "src/kernel/activity/SynchroComm.hpp" + +#include "src/kernel/activity/CommImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mailbox, simix, "Mailbox implementation"); @@ -35,7 +36,7 @@ MailboxImpl* MailboxImpl::byNameOrCreate(const char* name) xbt_assert(name, "Mailboxes must have a name"); /* two processes may have pushed the same mbox_create simcall at the same time */ smx_mailbox_t mbox = static_cast(xbt_dict_get_or_null(mailboxes, name)); - if (!mbox) { + if (not mbox) { mbox = new MailboxImpl(name); XBT_DEBUG("Creating a mailbox at %p with name %s", mbox, name); xbt_dict_set(mailboxes, mbox->name_, mbox, nullptr); @@ -52,7 +53,7 @@ void MailboxImpl::setReceiver(s4u::ActorPtr actor) /** @brief Pushes a communication activity into a mailbox * @param comm What to add */ -void MailboxImpl::push(activity::Comm* comm) +void MailboxImpl::push(activity::CommImpl* comm) { this->comm_queue.push_back(comm); comm->mbox = this; @@ -63,7 +64,7 @@ void MailboxImpl::push(activity::Comm* comm) */ void MailboxImpl::remove(smx_activity_t activity) { - simgrid::kernel::activity::Comm* comm = static_cast(activity); + simgrid::kernel::activity::CommImpl* comm = static_cast(activity); comm->mbox = nullptr; for (auto it = this->comm_queue.begin(); it != this->comm_queue.end(); it++)