Use new style Actor::on_exit().

[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 fb1efa6..a8547d4 100644 (file)
--- a/examples/s4u/actor-kill/s4u-actor-kill.cpp
+++ b/examples/s4u/actor-kill/s4u-actor-kill.cpp
@@ -7,15 +7,9 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_kill, "Messages specific for this s4u example");
 
-static int on_exit(void*, void*)
-{
-  XBT_INFO("I have been killed!");
-  return 0;
-}
-
 static void victimA_fun()
 {
-  simgrid::s4u::this_actor::onExit(on_exit, nullptr);
+  simgrid::s4u::this_actor::on_exit([](int, void*) { XBT_INFO("I have been killed!"); }, nullptr);
   XBT_INFO("Hello!");
   XBT_INFO("Suspending myself");
   simgrid::s4u::this_actor::suspend(); /* - Start by suspending itself */
@@ -60,7 +54,7 @@ static void killer()
   simgrid::s4u::this_actor::sleep_for(1);
 
   XBT_INFO("Killing everybody but myself");
-  simgrid::s4u::Actor::killAll();
+  simgrid::s4u::Actor::kill_all();
 
   XBT_INFO("OK, goodbye now. I commit a suicide.");
   simgrid::s4u::this_actor::kill();
@@ -73,7 +67,7 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  e.loadPlatform(argv[1]); /* - Load the platform description */
+  e.load_platform(argv[1]); /* - Load the platform description */
   /* - Create and deploy killer process, that will create the victim actors  */
   simgrid::s4u::Actor::create("killer", simgrid::s4u::Host::by_name("Tremblay"), killer);