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
adding documentation
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index 71e00875a7f2cc751e9cb73b8cec3686f580da9c..6ce4a0339b49f853888ab166d7314352d9120b86 100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-202
3
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-12,10
+12,9
@@
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");
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
-const
xbt
::string& Mailbox::get_name() const
+const
std
::string& Mailbox::get_name() const
{
return pimpl_->get_name();
}
{
return pimpl_->get_name();
}
@@
-58,10
+57,10
@@
bool Mailbox::ready() const
{
bool comm_ready = false;
if (not pimpl_->empty()) {
{
bool comm_ready = false;
if (not pimpl_->empty()) {
- comm_ready = pimpl_->front()->
state_
== kernel::activity::State::DONE;
+ comm_ready = pimpl_->front()->
get_state()
== kernel::activity::State::DONE;
} else if (pimpl_->is_permanent() && pimpl_->has_some_done_comm()) {
} else if (pimpl_->is_permanent() && pimpl_->has_some_done_comm()) {
- comm_ready = pimpl_->done_front()->
state_
== kernel::activity::State::DONE;
+ comm_ready = pimpl_->done_front()->
get_state()
== kernel::activity::State::DONE;
}
return comm_ready;
}
}
return comm_ready;
}
@@
-73,7
+72,7
@@
kernel::activity::CommImplPtr Mailbox::front() const
void Mailbox::set_receiver(ActorPtr actor)
{
void Mailbox::set_receiver(ActorPtr actor)
{
- kernel::actor::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
+ kernel::actor::simcall
_answered
([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) */
@@
-88,7
+87,7
@@
CommPtr Mailbox::put_init()
{
CommPtr res(new Comm());
res->sender_ = kernel::actor::ActorImpl::self();
{
CommPtr res(new Comm());
res->sender_ = kernel::actor::ActorImpl::self();
- res->
mailbox_ = this
;
+ res->
set_mailbox(this)
;
return res;
}
return res;
}
@@
-102,7
+101,7
@@
CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes)
xbt_assert(payload != nullptr, "You cannot send nullptr");
CommPtr res = put_init(payload, simulated_size_in_bytes);
xbt_assert(payload != nullptr, "You cannot send nullptr");
CommPtr res = put_init(payload, simulated_size_in_bytes);
- res->
vetoable_
start();
+ res->start();
return res;
}
return res;
}
@@
-110,7
+109,7
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes)
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
- put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->
vetoable_
start()->wait();
+ put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->start()->wait();
}
/** Blocking send with timeout */
}
/** Blocking send with timeout */
@@
-118,24
+117,29
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
- put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->
vetoable_
start()->wait_for(timeout);
+ put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->start()->wait_for(timeout);
}
CommPtr Mailbox::get_init()
{
}
CommPtr Mailbox::get_init()
{
-
CommPtr res(new Comm()
);
+
auto res = CommPtr(new Comm())->set_mailbox(this
);
res->receiver_ = kernel::actor::ActorImpl::self();
res->receiver_ = kernel::actor::ActorImpl::self();
- res->mailbox_ = this;
return res;
}
kernel::activity::ActivityImplPtr
return res;
}
kernel::activity::ActivityImplPtr
-Mailbox::iprobe(int type,
bool (*match_fun)(void*, void*, kernel::activity::CommImpl*)
, void* data)
+Mailbox::iprobe(int type,
const std::function<bool(void*, void*, kernel::activity::CommImpl*)>& match_fun
, void* data)
{
{
- return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+ return kernel::actor::simcall_answered(
+ [this, type, &match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
}
}
-} // namespace s4u
-} // namespace simgrid
+
+void Mailbox::clear()
+{
+ kernel::actor::simcall_answered([this]() { this->pimpl_->clear(true); });
+}
+
+} // namespace simgrid::s4u
/* **************************** Public C interface *************************** */
sg_mailbox_t sg_mailbox_by_name(const char* alias)
/* **************************** Public C interface *************************** */
sg_mailbox_t sg_mailbox_by_name(const char* alias)