X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..5ac17b95ed6baf225a7d90d65536e0ce1843ec93:/src/s4u/s4u_Mailbox.cpp?ds=sidebyside diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 7c3841ed02..03c12aa6c4 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -5,10 +5,8 @@ #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" -#include "src/msg/msg_private.hpp" -#include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_network_private.hpp" -#include "xbt/log.h" +#include "src/kernel/activity/MailboxImpl.hpp" +#include XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes"); @@ -26,7 +24,7 @@ const char* Mailbox::get_cname() const return pimpl_->get_cname(); } -MailboxPtr Mailbox::by_name(const char* name) +MailboxPtr Mailbox::by_name(std::string name) { kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::byNameOrNull(name); if (mbox == nullptr) { @@ -35,11 +33,6 @@ MailboxPtr Mailbox::by_name(const char* name) return MailboxPtr(&mbox->piface_, true); } -MailboxPtr Mailbox::by_name(std::string name) -{ - return by_name(name.c_str()); -} - bool Mailbox::empty() { return pimpl_->comm_queue.empty();