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
Sanitize the prototype of Actor::on_exit() callbacks
[simgrid.git]
/
examples
/
s4u
/
actor-kill
/
s4u-actor-kill.cpp
diff --git
a/examples/s4u/actor-kill/s4u-actor-kill.cpp
b/examples/s4u/actor-kill/s4u-actor-kill.cpp
index
1a000f3
..
3226e94
100644
(file)
--- a/
examples/s4u/actor-kill/s4u-actor-kill.cpp
+++ b/
examples/s4u/actor-kill/s4u-actor-kill.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2017-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-201
9
. 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. */
@@
-9,7
+9,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_kill, "Messages specific for this s4u exa
static void victimA_fun()
{
static void victimA_fun()
{
- simgrid::s4u::this_actor::on_exit([](
int, void*) { XBT_INFO("I have been killed!"); }, nullptr
);
+ simgrid::s4u::this_actor::on_exit([](
bool /*failed*/) { XBT_INFO("I have been killed!"); }
);
XBT_INFO("Hello!");
XBT_INFO("Suspending myself");
simgrid::s4u::this_actor::suspend(); /* - Start by suspending itself */
XBT_INFO("Hello!");
XBT_INFO("Suspending myself");
simgrid::s4u::this_actor::suspend(); /* - Start by suspending itself */
@@
-37,7
+37,7
@@
static void killer()
simgrid::s4u::this_actor::sleep_for(2);
XBT_INFO("Kill the victim A"); /* - and then kill it */
simgrid::s4u::this_actor::sleep_for(2);
XBT_INFO("Kill the victim A"); /* - and then kill it */
- simgrid::s4u::Actor::
kill(victimA->get_pid()); // Kill by PID is legit
+ simgrid::s4u::Actor::
by_pid(victimA->get_pid())->kill(); // You can retrieve an actor from its PID (and then kill it)
simgrid::s4u::this_actor::sleep_for(1);
simgrid::s4u::this_actor::sleep_for(1);
@@
-59,7
+59,7
@@
static void killer()
XBT_INFO("OK, goodbye now. I commit a suicide.");
simgrid::s4u::this_actor::exit();
XBT_INFO("OK, goodbye now. I commit a suicide.");
simgrid::s4u::this_actor::exit();
- XBT_INFO("This line
will never get
displayed: I'm already dead since the previous line.");
+ XBT_INFO("This line
never gets
displayed: I'm already dead since the previous line.");
}
int main(int argc, char* argv[])
}
int main(int argc, char* argv[])