cut the backtrace displayed from sthread to the sthread_create to hide useless cruft

[simgrid.git] / examples / cpp / io-priority / s4u-io-priority.cpp

diff --git a/examples/cpp/io-priority/s4u-io-priority.cpp b/examples/cpp/io-priority/s4u-io-priority.cpp
index 1c8f4785ec2feaf22b5b0682a248aa3ce1ee5935..8f09c4c07c1e559c9a12faad9ff2c1ea416e886e 100644 (file)
--- a/examples/cpp/io-priority/s4u-io-priority.cpp
+++ b/examples/cpp/io-priority/s4u-io-priority.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-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,11 +6,12 @@
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+namespace sg4 = simgrid::s4u;
 
 static void writer()
 {
   /* - Retrieve all disks from current host */
-  std::vector<simgrid::s4u::Disk*> const& disk_list = simgrid::s4u::Host::current()->get_disks();
+  std::vector<sg4::Disk*> const& disk_list = sg4::Host::current()->get_disks();
   /* - Write 4,000,000 bytes on Disk1 */
   disk_list.front()->write(4000000);
   XBT_INFO("First write done.");
@@ -22,14 +23,14 @@ static void writer()
 static void privileged_writer()
 {
   /* - Retrieve all disks from current host */
-  std::vector<simgrid::s4u::Disk*> const& disk_list = simgrid::s4u::Host::current()->get_disks();
+  std::vector<sg4::Disk*> const& disk_list = sg4::Host::current()->get_disks();
 
   /* - Write 4,000,000 bytes on Disk1 but specifies that this I/O operation gets a larger share of the resource.
    *
    * Since the priority is 2, it writes twice as fast as a regular one.
    *
    * So instead of a half/half sharing between the two, we get a 1/3 vs. 2/3 sharing. */
-  disk_list.front()->io_init(4000000, simgrid::s4u::Io::OpType::WRITE)->set_priority(2)->wait();
+  disk_list.front()->write(4000000, 2);
   XBT_INFO("First write done.");
 
   /* Note that the timings printed when running this example are a bit misleading, because the uneven sharing only last
@@ -37,7 +38,7 @@ static void privileged_writer()
    * quickly. */
 
   /* Resynchronize actors before second write */
-  simgrid::s4u::this_actor::sleep_for(0.05);
+  sg4::this_actor::sleep_for(0.05);
 
   /* - Write 4,000,000 bytes on Disk1 again and this time :
    *    - Start the I/O operation asynchronously to get an IoPtr
@@ -51,8 +52,8 @@ static void privileged_writer()
    *   0.025s to write the last MB.
    */
 
-  simgrid::s4u::IoPtr io = disk_list.front()->write_async(4000000);
-  simgrid::s4u::this_actor::sleep_for(0.1);
+  sg4::IoPtr io = disk_list.front()->write_async(4000000);
+  sg4::this_actor::sleep_for(0.1);
   XBT_INFO("Increase priority for the priviledged writer (%.0f bytes remaining to write)", io->get_remaining());
   io->update_priority(2);
   io->wait();
@@ -61,13 +62,13 @@ static void privileged_writer()
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::create("writer", e.host_by_name("bob"), writer);
-  simgrid::s4u::Actor::create("privileged_writer", e.host_by_name("bob"), privileged_writer);
+  sg4::Actor::create("writer", e.host_by_name("bob"), writer);
+  sg4::Actor::create("privileged_writer", e.host_by_name("bob"), privileged_writer);
 
   e.run();