X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..b5f3f6c9de51658f70ca7b371120eafccf3826cd:/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 8f2b4eca25..623173734b 100644
--- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
+++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
@@ -1,28 +1,29 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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 C++ file acts as the foil to the corresponding XML file, where the
+   action takes place: Actors are started and stopped at predefined time.   */
+
 #include "simgrid/s4u.hpp"
 
 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*/)
   {
-    XBT_INFO("Hello! I go to sleep.");
-    simgrid::s4u::this_actor::onExit(my_onexit, NULL);
+    simgrid::s4u::this_actor::on_exit(
+        [](int, void*) {
+          /* Executed on process termination, to display a message helping to understand the output */
+          XBT_INFO("Exiting now (done sleeping or got killed).");
+        },
+        nullptr);
 
+    XBT_INFO("Hello! I go to sleep.");
     simgrid::s4u::this_actor::sleep_for(10);
   }
   void operator()() { XBT_INFO("Done sleeping."); }
@@ -36,9 +37,9 @@ int main(int argc, char* argv[])
                        "\tExample: %s msg_platform.xml msg_deployment.xml\n",
              argv[0], argv[0]);
 
-  e.loadPlatform(argv[1]); /* - Load the platform description */
-  e.registerFunction<sleeper>("sleeper");
-  e.loadDeployment(argv[2]); /* - Deploy the sleeper processes with explicit start/kill times */
+  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.run(); /* - Run the simulation */