cosmetics: define and use the sg4 namespace as a shortcut to simgrid::s4u

[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 d73b509..cc8ad72 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-2019. 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,31 +7,31 @@
    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");
 
 /* This actor just sleeps until termination */
 class sleeper {
-
 public:
   explicit sleeper(std::vector<std::string> /*args*/)
   {
-    simgrid::s4u::this_actor::on_exit([](bool /*failed*/) {
-      /* Executed on process termination, to display a message helping to understand the output */
+    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()()
+  void operator()() const
   {
     XBT_INFO("Hello! I go to sleep.");
-    simgrid::s4u::this_actor::sleep_for(10);
+    sg4::this_actor::sleep_for(10);
     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"
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
 
   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 */