X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc340a73928fe73a57a9664aeba0cf5a92b654c..b9625f82f86db0674e911887addce45dca31b57f:/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 7eea17a88e..9ef0d79ec0 100644
--- a/examples/s4u/actor-yield/s4u-actor-yield.cpp
+++ b/examples/s4u/actor-yield/s4u-actor-yield.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2020. 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. */
@@ -6,46 +6,42 @@
 #include "simgrid/s4u.hpp"
 
 /* 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 s4u-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.
-*/
+ * of time before ending.
+ *
+ * This serves as an example for the simgrid::s4u::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() = default;
- explicit yielder(std::vector<std::string> args)
-{ 
- number_of_yields = std::stod(args[1]);
-}
-void operator()()
-{
- for (int i = 0; i < number_of_yields; i++)
- simgrid::s4u::this_actor::yield();
- XBT_INFO("I yielded %ld times. Goodbye now!", number_of_yields);
-}
+  long number_of_yields;
+
+public:
+  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();
+    XBT_INFO("I yielded %ld times. Goodbye now!", number_of_yields);
+  }
 };
 
 int main(int argc, char* argv[])
 {
- simgrid::s4u::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.loadPlatform(argv[1]);  /* - Load the platform description */
- e.registerFunction<yielder>("yielder");
- std::vector<std::string> args; 
+  simgrid::s4u::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_actor<yielder>("yielder"); /* Register the class representing the actors */
 
- e.loadDeployment(argv[2]);
+  e.load_deployment(argv[2]);
 
- e.run();  /* - Run the simulation */
+  e.run(); /* - Run the simulation */
 
- return 0;
+  return 0;
 }