X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3721210a272c9593a3bccd52f63178403b5729e3..b3cda8e02de9884e5ec1a0b2c09764064adb160f:/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp

diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
index 19668e4155..cc8ad72652 100644
--- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
+++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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,41 +7,40 @@
    action takes place: Actors are started and stopped at predefined time.   */
 
 #include "simgrid/s4u.hpp"
+namespace sg4 = simgrid::s4u;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this s4u example");
 
-/* Executed on process termination, to display a message helping to understand the output */
-static int my_onexit(void*, void*)
-{
-  XBT_INFO("Exiting now (done sleeping or got killed).");
-  return 0;
-}
-
-/* Just sleep until termination */
+/* This actor just sleeps until termination */
 class sleeper {
-
 public:
   explicit sleeper(std::vector<std::string> /*args*/)
+  {
+    sg4::this_actor::on_exit([](bool /*failed*/) {
+      /* Executed on actor termination, to display a message helping to understand the output */
+      XBT_INFO("Exiting now (done sleeping or got killed).");
+    });
+  }
+  void operator()() const
   {
     XBT_INFO("Hello! I go to sleep.");
-    simgrid::s4u::this_actor::on_exit(my_onexit, NULL);
-
-    simgrid::s4u::this_actor::sleep_for(10);
+    sg4::this_actor::sleep_for(10);
+    XBT_INFO("Done sleeping.");
   }
-  void operator()() { XBT_INFO("Done sleeping."); }
 };
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
 
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-                       "\tExample: %s msg_platform.xml msg_deployment.xml\n",
+  xbt_assert(argc > 2,
+             "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s ../platforms/cluster_backbone.xml ./s4u_actor_lifetime_d.xml\n",
              argv[0], argv[0]);
 
   e.load_platform(argv[1]); /* Load the platform description */
   e.register_actor<sleeper>("sleeper");
-  e.load_deployment(argv[2]); /*  Deploy the sleeper processes with explicit start/kill times */
+  e.load_deployment(argv[2]); /*  Deploy the sleeper actors with explicit start/kill times */
 
   e.run(); /* - Run the simulation */