doc cosmetics, and cleanup the API

[simgrid.git] / 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 a9201ae..9f12c55 100644 (file)
--- 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-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. */
@@ -10,24 +10,25 @@
 
 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 void my_onexit(int, void*)
-{
-  XBT_INFO("Exiting now (done sleeping or got killed).");
-}
-
-/* Just sleep until termination */
+/* This actor just sleeps until termination */
 class sleeper {
 
 public:
   explicit sleeper(std::vector<std::string> /*args*/)
+  {
+    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);
+  }
+  void operator()()
   {
     XBT_INFO("Hello! I go to sleep.");
-    simgrid::s4u::this_actor::on_exit(my_onexit, NULL);
-
     simgrid::s4u::this_actor::sleep_for(10);
+    XBT_INFO("Done sleeping.");
   }
-  void operator()() { XBT_INFO("Done sleeping."); }
 };
 
 int main(int argc, char* argv[])