X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bfafcab47ae9cd7856bd8d129404c33079d6afe..1da71cea80ede085ba178e6da930cca784c868c0:/examples/cpp/io-async/s4u-io-async.cpp

diff --git a/examples/cpp/io-async/s4u-io-async.cpp b/examples/cpp/io-async/s4u-io-async.cpp
index fba5031649..9d96fe32ed 100644
--- a/examples/cpp/io-async/s4u-io-async.cpp
+++ b/examples/cpp/io-async/s4u-io-async.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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,13 +6,14 @@
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 static void test(sg_size_t size)
 {
-  simgrid::s4u::Disk* disk = simgrid::s4u::Host::current()->get_disks().front();
+  const sg4::Disk* disk = sg4::Host::current()->get_disks().front();
   XBT_INFO("Hello! read %llu bytes from %s", size, disk->get_cname());
 
-  simgrid::s4u::IoPtr activity = disk->io_init(size, simgrid::s4u::Io::OpType::READ);
+  sg4::IoPtr activity = disk->io_init(size, sg4::Io::OpType::READ);
   activity->start();
   activity->wait();
 
@@ -21,10 +22,10 @@ static void test(sg_size_t size)
 
 static void test_waitfor(sg_size_t size)
 {
-  simgrid::s4u::Disk* disk = simgrid::s4u::Host::current()->get_disks().front();
+  const sg4::Disk* disk = sg4::Host::current()->get_disks().front();
   XBT_INFO("Hello! write %llu bytes from %s", size, disk->get_cname());
 
-  simgrid::s4u::IoPtr activity = disk->write_async(size);
+  sg4::IoPtr activity = disk->write_async(size);
   try {
     activity->wait_for(0.5);
   } catch (const simgrid::TimeoutException&) {
@@ -36,12 +37,12 @@ static void test_waitfor(sg_size_t size)
 
 static void test_cancel(sg_size_t size)
 {
-  simgrid::s4u::Disk* disk = simgrid::s4u::Host::current()->get_disks().front();
-  simgrid::s4u::this_actor::sleep_for(0.5);
+  const sg4::Disk* disk = sg4::Host::current()->get_disks().front();
+  sg4::this_actor::sleep_for(0.5);
   XBT_INFO("Hello! write %llu bytes from %s", size, disk->get_cname());
 
-  simgrid::s4u::IoPtr activity = disk->write_async(size);
-  simgrid::s4u::this_actor::sleep_for(0.5);
+  sg4::IoPtr activity = disk->write_async(size);
+  sg4::this_actor::sleep_for(0.5);
   XBT_INFO("I changed my mind, cancel!");
   activity->cancel();
 
@@ -50,13 +51,13 @@ static void test_cancel(sg_size_t size)
 
 static void test_monitor(sg_size_t size)
 {
-  simgrid::s4u::Disk* disk = simgrid::s4u::Host::current()->get_disks().front();
-  simgrid::s4u::this_actor::sleep_for(1);
-  simgrid::s4u::IoPtr activity = disk->write_async(size);
+  const sg4::Disk* disk = sg4::Host::current()->get_disks().front();
+  sg4::this_actor::sleep_for(1);
+  sg4::IoPtr activity = disk->write_async(size);
 
   while (not activity->test()) {
     XBT_INFO("Remaining amount of bytes to write: %g", activity->get_remaining());
-    simgrid::s4u::this_actor::sleep_for(0.2);
+    sg4::this_actor::sleep_for(0.2);
   }
   activity->wait();
 
@@ -65,16 +66,16 @@ static void test_monitor(sg_size_t size)
 
 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("test", simgrid::s4u::Host::by_name("bob"), test, 2e7);
-  simgrid::s4u::Actor::create("test_waitfor", simgrid::s4u::Host::by_name("alice"), test_waitfor, 5e7);
-  simgrid::s4u::Actor::create("test_cancel", simgrid::s4u::Host::by_name("alice"), test_cancel, 5e7);
-  simgrid::s4u::Actor::create("test_monitor", simgrid::s4u::Host::by_name("alice"), test_monitor, 5e7);
+  sg4::Actor::create("test", e.host_by_name("bob"), test, 2e7);
+  sg4::Actor::create("test_waitfor", e.host_by_name("alice"), test_waitfor, 5e7);
+  sg4::Actor::create("test_cancel", e.host_by_name("alice"), test_cancel, 5e7);
+  sg4::Actor::create("test_monitor", e.host_by_name("alice"), test_monitor, 5e7);
 
   e.run();
 
-  XBT_INFO("Simulation time %g", e.get_clock());
+  XBT_INFO("Simulation time %g", sg4::Engine::get_clock());
 
   return 0;
 }