X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af72ee01a6a0c01b1a67dc3095f952fd8ab1dd42..c6683b41cf9ecda70c1d4d75d1effc61903a894f:/examples/cpp/trace-categories/s4u-trace-categories.cpp

diff --git a/examples/cpp/trace-categories/s4u-trace-categories.cpp b/examples/cpp/trace-categories/s4u-trace-categories.cpp
index 62de2b46ad..adf6f3d3db 100644
--- a/examples/cpp/trace-categories/s4u-trace-categories.cpp
+++ b/examples/cpp/trace-categories/s4u-trace-categories.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. */
@@ -11,6 +11,8 @@
 #include "simgrid/instr.h"
 #include "simgrid/s4u.hpp"
 
+namespace sg4 = simgrid::s4u;
+
 struct Task {
   std::string name;
   std::string category;
@@ -20,7 +22,7 @@ struct Task {
 
 static void master()
 {
-  auto mbox = simgrid::s4u::Mailbox::by_name("master_mailbox");
+  auto* mbox = sg4::Mailbox::by_name("master_mailbox");
   for (int i = 0; i < 10; i++) {
     Task task;
     if (i % 2)
@@ -37,35 +39,32 @@ static void master()
 
 static void worker()
 {
-  auto mbox = simgrid::s4u::Mailbox::by_name("master_mailbox");
+  auto* mbox = sg4::Mailbox::by_name("master_mailbox");
   while (true) {
     auto task = mbox->get_unique<Task>();
     if (task->name == "finalize") {
       break;
     }
     // creating task and setting its category
-    simgrid::s4u::this_actor::exec_init(task->flops)
-        ->set_name(task->name)
-        ->set_tracing_category(task->category)
-        ->wait();
+    sg4::this_actor::exec_init(task->flops)->set_name(task->name)->set_tracing_category(task->category)->wait();
   }
 }
 
 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 small_platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]);
 
   // declaring user categories with RGB colors
-  TRACE_category_with_color("compute", "1 0 0");  // red
-  TRACE_category_with_color("request", "0 1 0");  // green
-  TRACE_category_with_color("data", "0 0 1");     // blue
-  TRACE_category_with_color("finalize", "0 0 0"); // black
+  simgrid::instr::declare_tracing_category("compute", "1 0 0");  // red
+  simgrid::instr::declare_tracing_category("request", "0 1 0");  // green
+  simgrid::instr::declare_tracing_category("data", "0 0 1");     // blue
+  simgrid::instr::declare_tracing_category("finalize", "0 0 0"); // black
 
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), worker);
+  sg4::Actor::create("master", e.host_by_name("Tremblay"), master);
+  sg4::Actor::create("worker", e.host_by_name("Fafard"), worker);
 
   e.run();
   return 0;