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
Don't use pass-by-value for large parameters.
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
f31600a
..
6cd3ede
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-41,23
+41,23
@@
ActorPtr Actor::self()
}
ActorPtr Actor::init(std::string name, s4u::Host* host)
{
}
ActorPtr Actor::init(std::string name, s4u::Host* host)
{
- return SIMIX_process_self()->init(std::move(name), host)->iface();
+ smx_actor_t self = SIMIX_process_self();
+ simgrid::kernel::actor::ActorImpl* actor =
+ simgrid::simix::simcall([self, name, host] { return self->init(std::move(name), host).get(); });
+ return actor->ciface();
}
}
-ActorPtr Actor::start(
std::function<void()>
code)
+ActorPtr Actor::start(
const std::function<void()>&
code)
{
{
- simgrid::simix::simcall([this,
code] { return this->get_impl()
->start(code); });
+ simgrid::simix::simcall([this,
&code] { pimpl_
->start(code); });
return this;
}
return this;
}
-ActorPtr Actor::create(std::string name, s4u::Host* host,
std::function<void()>
code)
+ActorPtr Actor::create(std::string name, s4u::Host* host,
const std::function<void()>&
code)
{
{
- smx_actor_t self = SIMIX_process_self();
-
- simgrid::kernel::actor::ActorImpl* actor =
- simgrid::simix::simcall([self, name, host, code] { return self->init(std::move(name), host)->start(code); });
+ simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(std::move(name), code, nullptr, host, nullptr);
- return actor->
c
iface();
+ return actor->iface();
}
ActorPtr Actor::create(std::string name, s4u::Host* host, const std::string& function, std::vector<std::string> args)
}
ActorPtr Actor::create(std::string name, s4u::Host* host, const std::string& function, std::vector<std::string> args)
@@
-106,7
+106,12
@@
void Actor::on_exit(int_f_pvoid_pvoid_t fun,
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
-void Actor::on_exit(std::function<void(bool /*failed*/)> const fun)
+void Actor::on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
+{
+ on_exit([fun, data](bool exit) { fun(exit, data); });
+}
+
+void Actor::on_exit(const std::function<void(bool /*failed*/)>& fun)
{
simgrid::simix::simcall(
[this, fun] { SIMIX_process_on_exit(pimpl_, [fun](int a, void* /*data*/) { fun(a != 0); }, nullptr); });
{
simgrid::simix::simcall(
[this, fun] { SIMIX_process_on_exit(pimpl_, [fun](int a, void* /*data*/) { fun(a != 0); }, nullptr); });
@@
-431,12
+436,12
@@
void exit()
simgrid::simix::simcall([actor] { actor->exit(); });
}
simgrid::simix::simcall([actor] { actor->exit(); });
}
-void on_exit(
std::function<void(bool)> const
fun)
+void on_exit(
const std::function<void(bool)>&
fun)
{
SIMIX_process_self()->iface()->on_exit(fun);
}
{
SIMIX_process_self()->iface()->on_exit(fun);
}
-void on_exit(
std::function<void(int, void*)> const
fun, void* data) /* deprecated */
+void on_exit(
const std::function<void(int, void*)>&
fun, void* data) /* deprecated */
{
SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); });
}
{
SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); });
}