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
Make mailbox matching functions return a bool.
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index
52a0874
..
0ab6de7
100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-15,7
+15,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes")
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-const
simgrid::
xbt::string& Mailbox::get_name() const
+const xbt::string& Mailbox::get_name() const
{
return pimpl_->get_name();
}
{
return pimpl_->get_name();
}
@@
-25,13
+25,13
@@
const char* Mailbox::get_cname() const
return pimpl_->get_cname();
}
return pimpl_->get_cname();
}
-Mailbox
Ptr
Mailbox::by_name(const std::string& name)
+Mailbox
*
Mailbox::by_name(const std::string& name)
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
- mbox =
simix::simcall([
name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
+ mbox =
kernel::actor::simcall([&
name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
}
}
- return
MailboxPtr(&mbox->piface_, true)
;
+ return
&mbox->piface_
;
}
bool Mailbox::empty()
}
bool Mailbox::empty()
@@
-48,10
+48,10
@@
bool Mailbox::ready()
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
- comm_ready = pimpl_->comm_queue_.front()->state_ ==
SIMIX_
DONE;
-
+ comm_ready = pimpl_->comm_queue_.front()->state_ ==
kernel::activity::State::
DONE;
+
} else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
} else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
- comm_ready = pimpl_->done_comm_queue_.front()->state_ ==
SIMIX_
DONE;
+ comm_ready = pimpl_->done_comm_queue_.front()->state_ ==
kernel::activity::State::
DONE;
}
return comm_ready;
}
}
return comm_ready;
}
@@
-63,7
+63,7
@@
kernel::activity::CommImplPtr Mailbox::front()
void Mailbox::set_receiver(ActorPtr actor)
{
void Mailbox::set_receiver(ActorPtr actor)
{
-
simix
::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
+
kernel::actor
::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
}
/** @brief get the receiver (process associated to the mailbox) */
}
/** @brief get the receiver (process associated to the mailbox) */
@@
-77,7
+77,7
@@
ActorPtr Mailbox::get_receiver()
CommPtr Mailbox::put_init()
{
CommPtr res = CommPtr(new s4u::Comm());
CommPtr Mailbox::put_init()
{
CommPtr res = CommPtr(new s4u::Comm());
- res->sender_ =
SIMIX_process_
self();
+ res->sender_ =
kernel::actor::ActorImpl::
self();
res->mailbox_ = this;
return res;
}
res->mailbox_ = this;
return res;
}
@@
-121,7
+121,7
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
s4u::CommPtr Mailbox::get_init()
{
CommPtr res = CommPtr(new s4u::Comm());
s4u::CommPtr Mailbox::get_init()
{
CommPtr res = CommPtr(new s4u::Comm());
- res->receiver_ =
SIMIX_process_
self();
+ res->receiver_ =
kernel::actor::ActorImpl::
self();
res->mailbox_ = this;
return res;
}
res->mailbox_ = this;
return res;
}
@@
-150,9
+150,9
@@
void* Mailbox::get(double timeout)
return res;
}
return res;
}
-smx_activity_t Mailbox::iprobe(int type,
int
(*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
+smx_activity_t Mailbox::iprobe(int type,
bool
(*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
{
{
- return
simix
::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+ return
kernel::actor
::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
}
} // namespace s4u
} // namespace simgrid
}
} // namespace s4u
} // namespace simgrid