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

[simgrid.git] / examples / s4u / actor-yield / s4u-actor-yield.cpp

diff --git a/examples/s4u/actor-yield/s4u-actor-yield.cpp b/examples/s4u/actor-yield/s4u-actor-yield.cpp
index 8fc130c..b7e377a 100644 (file)
--- a/examples/s4u/actor-yield/s4u-actor-yield.cpp
+++ b/examples/s4u/actor-yield/s4u-actor-yield.cpp
@@ -1,43 +1,44 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-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. */
 
-#include "simgrid/s4u.hpp"
+#include <simgrid/s4u.hpp>
+namespace sg4 = simgrid::s4u;
 
 /* This example does not much: It just spans over-polite actor that yield a large amount
  * of time before ending.
  *
- * This serves as an example for the simgrid::s4u::this_actor::yield() function, with which an actor can request
+ * This serves as an example for the sg4::this_actor::yield() function, with which an actor can request
  * to be rescheduled after the other actor that are ready at the current timestamp.
  *
  * It can also be used to benchmark our context-switching mechanism.
  */
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_yield, "Messages specific for this s4u example");
-/* Main function of the Yielder process */
+/* Main function of the Yielder actor */
 class yielder {
   long number_of_yields;
 
 public:
-  explicit yielder(std::vector<std::string> args) { number_of_yields = std::stod(args[1]); }
-  void operator()()
+  explicit yielder(std::vector<std::string> args) { number_of_yields = std::stol(args[1]); }
+  void operator()() const
   {
     for (int i = 0; i < number_of_yields; i++)
-      simgrid::s4u::this_actor::yield();
+      sg4::this_actor::yield();
     XBT_INFO("I yielded %ld times. Goodbye now!", number_of_yields);
   }
 };
 
 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 platform.xml deployment.xml\n",
              argv[0], argv[0]);
 
-  e.load_platform(argv[1]); /* - Load the platform description */
-  e.register_function<yielder>("yielder");
+  e.load_platform(argv[1]);             /* Load the platform description */
+  e.register_actor<yielder>("yielder"); /* Register the class representing the actors */
 
   e.load_deployment(argv[2]);