X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6314dfce77402e03a06492f6cd483417f0ad7e06..08e94eb0482589e4b287cbea301b84daf52635bd:/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 fe726b40ae..3226e94cf8 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 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*)
+static void victimA_fun()
 {
-  XBT_INFO("I have been killed!");
-  return 0;
-}
-
-static void victim()
-{
-  simgrid::s4u::this_actor::onExit(on_exit, 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 */
@@ -24,28 +18,48 @@ static void victim()
   XBT_INFO("Bye!"); /* - But will never reach the end of it */
 }
 
+static void victimB_fun()
+{
+  XBT_INFO("Terminate before being killed");
+}
+
 static void killer()
 {
   XBT_INFO("Hello!"); /* - First start a victim process */
-  simgrid::s4u::ActorPtr poor_victim =
-      simgrid::s4u::Actor::createActor("victim", simgrid::s4u::Host::by_name("Fafard"), victim);
+  simgrid::s4u::ActorPtr victimA =
+      simgrid::s4u::Actor::create("victim A", simgrid::s4u::Host::by_name("Fafard"), victimA_fun);
+  simgrid::s4u::ActorPtr victimB =
+      simgrid::s4u::Actor::create("victim B", simgrid::s4u::Host::by_name("Jupiter"), victimB_fun);
   simgrid::s4u::this_actor::sleep_for(10); /* - Wait for 10 seconds */
 
-  XBT_INFO("Resume the victim"); /* - Resume it from its suspended state */
-  poor_victim->resume();
+  XBT_INFO("Resume the victim A"); /* - Resume it from its suspended state */
+  victimA->resume();
   simgrid::s4u::this_actor::sleep_for(2);
 
-  XBT_INFO("Kill the victim"); /* - and then kill it */
-  poor_victim->kill();
+  XBT_INFO("Kill the victim A"); /* - and then kill it */
+  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);
+
+  XBT_INFO("Kill victimB, even if it's already dead"); /* that's a no-op, there is no zombies in SimGrid */
+  victimB->kill(); // the actor is automatically garbage-collected after this last reference
+
+  simgrid::s4u::this_actor::sleep_for(1);
+
+  XBT_INFO("Start a new actor, and kill it right away");
+  simgrid::s4u::ActorPtr victimC =
+      simgrid::s4u::Actor::create("victim C", simgrid::s4u::Host::by_name("Jupiter"), victimA_fun);
+  victimC->kill();
+
   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[])
@@ -53,17 +67,11 @@ 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 */
-  /* - Create and deploy killer process, that will create the victim process  */
-  simgrid::s4u::Actor::createActor("killer", simgrid::s4u::Host::by_name("Tremblay"), killer);
-  simgrid::s4u::Actor::createActor("Alice", simgrid::s4u::Host::by_name("Jupiter"), victim);
-  simgrid::s4u::Actor::createActor("Bob", simgrid::s4u::Host::by_name("Ginette"), victim);
-  simgrid::s4u::Actor::createActor("Carol", simgrid::s4u::Host::by_name("Bourassa"), victim);
-  simgrid::s4u::Actor::createActor("Dave", simgrid::s4u::Host::by_name("Boivin"), victim);
+  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);
 
   e.run(); /* - Run the simulation */
 
-  XBT_INFO("Simulation time %g", e.getClock());
-
   return 0;
 }