X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af72ee01a6a0c01b1a67dc3095f952fd8ab1dd42..3c7c64745aa5e60415bb85af482c7b0d0fca2b2b:/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp

diff --git a/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp b/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
index 6867422e6c..7495c16975 100644
--- a/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
+++ b/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2023. 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,14 +6,15 @@
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_exec_waitfor, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 static void worker()
 {
-  simgrid::s4u::ExecPtr exec;
-  double amount = 5 * simgrid::s4u::this_actor::get_host()->get_speed();
+  sg4::ExecPtr exec;
+  double amount = 5 * sg4::this_actor::get_host()->get_speed();
   XBT_INFO("Create an activity that should run for 5 seconds");
 
-  exec = simgrid::s4u::this_actor::exec_async(amount);
+  exec = sg4::this_actor::exec_async(amount);
 
   /* Now that execution is started, wait for 3 seconds. */
   XBT_INFO("But let it end after 3 seconds");
@@ -21,21 +22,21 @@ static void worker()
     exec->wait_for(3);
     XBT_INFO("Execution complete");
   } catch (const simgrid::TimeoutException&) {
-    XBT_INFO("Execution Timeout!");
+    XBT_INFO("Execution Wait Timeout!");
   }
 
   /* do it again, but this time with a timeout greater than the duration of the execution */
   XBT_INFO("Create another activity that should run for 5 seconds and wait for it for 6 seconds");
-  exec = simgrid::s4u::this_actor::exec_async(amount);
+  exec = sg4::this_actor::exec_async(amount);
   try {
     exec->wait_for(6);
     XBT_INFO("Execution complete");
   } catch (const simgrid::TimeoutException&) {
-    XBT_INFO("Execution Timeout!");
+    XBT_INFO("Execution Wait Timeout!");
   }
 
   XBT_INFO("Finally test with a parallel execution");
-  auto hosts         = simgrid::s4u::Engine::get_instance()->get_all_hosts();
+  auto hosts         = sg4::Engine::get_instance()->get_all_hosts();
   size_t hosts_count = hosts.size();
   std::vector<double> computation_amounts;
   std::vector<double> communication_amounts;
@@ -46,20 +47,20 @@ static void worker()
     for (size_t j = i + 1; j < hosts_count; j++)
       communication_amounts[i * hosts_count + j] = 1e7; // 10 MB
 
-  exec = simgrid::s4u::this_actor::exec_init(hosts, computation_amounts, communication_amounts);
+  exec = sg4::this_actor::exec_init(hosts, computation_amounts, communication_amounts);
   try {
     exec->wait_for(2);
     XBT_INFO("Parallel Execution complete");
   } catch (const simgrid::TimeoutException&) {
-    XBT_INFO("Parallel Execution Timeout!");
+    XBT_INFO("Parallel Execution Wait Timeout!");
   }
 }
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), worker);
+  sg4::Actor::create("worker", e.host_by_name("Tremblay"), worker);
   e.run();
 
   return 0;