X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ff3a4cf6e03165421f65616a22be86b8f528e21..cdac506670725ae4fe40b3b1a31ceeb9488ce53a:/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 d9767141f3..9c0f356462 100644
--- 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-2018 The SimGrid Team. All rights reserved.           */
+/* Copyright (c) 2017-2019. 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. */
@@ -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 */
@@ -43,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::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);
 
@@ -60,12 +54,12 @@ 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();
+  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[])
@@ -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);