X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e60fe3cfd5cf5305888fcca0ae19700d808bb23..596e36117322c22fd31372e7803bc197bcd4a016:/docs/source/tuto_s4u/master-workers-lab2.cpp

diff --git a/docs/source/tuto_s4u/master-workers-lab2.cpp b/docs/source/tuto_s4u/master-workers-lab2.cpp
index 573c5f3707..7f8b3943ee 100644
--- a/docs/source/tuto_s4u/master-workers-lab2.cpp
+++ b/docs/source/tuto_s4u/master-workers-lab2.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. 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. */
@@ -18,12 +18,12 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_masterworker, "Messages specific for this e
 
 static void worker()
 {
-  const std::string mailbox_name   = std::string("worker-") + std::to_string(simgrid::s4u::this_actor::get_pid());
-  simgrid::s4u::Mailbox* mailbox   = simgrid::s4u::Mailbox::by_name(mailbox_name);
+  const std::string mailbox_name = "worker-" + std::to_string(simgrid::s4u::this_actor::get_pid());
+  simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
   double compute_cost;
   do {
-    double* msg  = static_cast<double*>(mailbox->get());
+    double* msg  = mailbox->get<double>();
     compute_cost = *msg;
     delete msg;
 
@@ -45,7 +45,7 @@ static void master(std::vector<std::string> args)
   std::vector<simgrid::s4u::ActorPtr> actors;
 
   for (auto* host : simgrid::s4u::Engine::get_instance()->get_all_hosts()) {
-    simgrid::s4u::ActorPtr act = simgrid::s4u::Actor::create(std::string("Worker-") + host->get_name(), host, worker);
+    simgrid::s4u::ActorPtr act = simgrid::s4u::Actor::create("Worker-" + host->get_name(), host, worker);
     actors.push_back(act);
   }
 
@@ -53,9 +53,9 @@ static void master(std::vector<std::string> args)
 
   for (int i = 0; i < tasks_count; i++) { /* For each task to be executed: */
     /* - Select a worker in a round-robin way */
-    aid_t worker_pid                 = actors.at(i % actors.size())->get_pid();
-    std::string mailbox_name         = std::string("worker-") + std::to_string(worker_pid);
-    simgrid::s4u::Mailbox* mailbox   = simgrid::s4u::Mailbox::by_name(mailbox_name);
+    aid_t worker_pid               = actors.at(i % actors.size())->get_pid();
+    std::string mailbox_name       = "worker-" + std::to_string(worker_pid);
+    simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
     /* - Send the computation cost to that worker */
     XBT_INFO("Sending task %d of %ld to mailbox '%s'", i, tasks_count, mailbox->get_cname());
@@ -65,8 +65,8 @@ static void master(std::vector<std::string> args)
   XBT_INFO("All tasks have been dispatched. Request all workers to stop.");
   for (unsigned long i = 0; i < actors.size(); i++) {
     /* The workers stop when receiving a negative compute_cost */
-    std::string mailbox_name         = std::string("worker-") + std::to_string(actors.at(i)->get_pid());
-    simgrid::s4u::Mailbox* mailbox   = simgrid::s4u::Mailbox::by_name(mailbox_name);
+    std::string mailbox_name       = "worker-" + std::to_string(actors.at(i)->get_pid());
+    simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
     mailbox->put(new double(-1.0), 0);
   }