A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stringify s4u::Mailbox and k::a::MailboxImpl
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index
7c3841e
..
03c12aa
100644
(file)
--- 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 "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 <simgrid/mailbox.h>
XBT_LOG_EXTERNAL_CATEGORY(s4u);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes");
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();
}
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) {
{
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);
}
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();
bool Mailbox::empty()
{
return pimpl_->comm_queue.empty();