smpi: fix issue with message IDs. In case of persistent request reused multiple times...

[simgrid.git] / examples / cpp / trace-process-migration / s4u-trace-process-migration.cpp

diff --git a/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp b/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp
index 85a428d30bf8a9bb147b1027a0d095b4914cfcb8..a09afe82e69170f55fd92a203df4a92a6a3429c5 100644 (file)
--- a/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp
+++ b/examples/cpp/trace-process-migration/s4u-trace-process-migration.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. */
@@ -12,28 +12,30 @@
 #include "simgrid/s4u.hpp"
 #include <memory>
 
+namespace sg4 = simgrid::s4u;
+
 /* The guy we will move from host to host. It move alone and then is moved by policeman back  */
 static void emigrant()
 {
-  auto mailbox = simgrid::s4u::Mailbox::by_name("master_mailbox");
+  auto* mailbox = sg4::Mailbox::by_name("master_mailbox");
 
-  simgrid::s4u::this_actor::sleep_for(2);
+  sg4::this_actor::sleep_for(2);
 
   while (true) { // I am an eternal emigrant
     auto destination = mailbox->get_unique<std::string>();
     if (destination->empty())
       break; // there is no destination, die
-    simgrid::s4u::this_actor::set_host(simgrid::s4u::Host::by_name(*destination));
-    simgrid::s4u::this_actor::sleep_for(2); // I am tired, have to sleep for 2 seconds
+    sg4::this_actor::set_host(sg4::Host::by_name(*destination));
+    sg4::this_actor::sleep_for(2); // I am tired, have to sleep for 2 seconds
   }
 }
 
 static void policeman()
 {
-  // I am the master of emigrant process,
+  // I am the master of emigrant actor,
   // I tell it where it must emigrate to.
   auto destinations = {"Tremblay", "Jupiter", "Fafard", "Ginette", "Bourassa", "Fafard", "Tremblay", "Ginette", ""};
-  auto mailbox      = simgrid::s4u::Mailbox::by_name("master_mailbox");
+  auto* mailbox     = sg4::Mailbox::by_name("master_mailbox");
 
   for (auto const& destination : destinations) {
     mailbox->put_init(new std::string(destination), 0)->set_tracing_category("migration_order")->wait();
@@ -42,15 +44,15 @@ static void policeman()
 
 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]);
 
-  TRACE_category("migration_order");
+  simgrid::instr::declare_tracing_category("migration_order");
 
-  simgrid::s4u::Actor::create("emigrant", simgrid::s4u::Host::by_name("Fafard"), emigrant);
-  simgrid::s4u::Actor::create("policeman", simgrid::s4u::Host::by_name("Tremblay"), policeman);
+  sg4::Actor::create("emigrant", e.host_by_name("Fafard"), emigrant);
+  sg4::Actor::create("policeman", e.host_by_name("Tremblay"), policeman);
 
   e.run();
   return 0;