X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa67057cbae409c22a57e9dcf4d82a2859e97f45..6c09a0f13195fb1a374db37de19ac9196dab3249:/examples/s4u/app-token-ring/s4u-app-token-ring.cpp

diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
index fd0d1269e6..acd4718eac 100644
--- a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
+++ b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2020. 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. */
@@ -13,8 +13,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_token_ring, "Messages specific for this s4u
 
 class RelayRunner {
   size_t task_comm_size = 1000000; /* The token is 1MB long*/
-  simgrid::s4u::MailboxPtr my_mailbox;
-  simgrid::s4u::MailboxPtr neighbor_mailbox;
+  simgrid::s4u::Mailbox* my_mailbox;
+  simgrid::s4u::Mailbox* neighbor_mailbox;
   unsigned int rank      = 0;
 
 public:
@@ -24,24 +24,23 @@ public:
   {
     try {
       rank = std::stoi(simgrid::s4u::this_actor::get_name());
-    } catch (std::invalid_argument& ia) {
-      throw std::invalid_argument(std::string("Processes of this example must have a numerical name, not ") +
-                                  ia.what());
+    } catch (const std::invalid_argument& ia) {
+      throw std::invalid_argument(std::string("Actors of this example must have a numerical name, not ") + ia.what());
     }
     my_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(rank));
     if (rank + 1 == simgrid::s4u::Engine::get_instance()->get_host_count())
-      /* The last process, which sends the token back to rank 0 */
+      /* The last actor sends the token back to rank 0 */
       neighbor_mailbox = simgrid::s4u::Mailbox::by_name("0");
     else
-      /* The others processes send to their right neighbor (rank+1) */
+      /* The others actors send to their right neighbor (rank+1) */
       neighbor_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(rank + 1));
 
     if (rank == 0) {
-      /* The root process (rank 0) first sends the token then waits to receive it back */
+      /* The root actor (rank 0) first sends the token then waits to receive it back */
       XBT_INFO("Host \"%u\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox->get_cname());
       std::string msg = "Token";
       neighbor_mailbox->put(&msg, task_comm_size);
-      std::string* res = static_cast<std::string*>(my_mailbox->get());
+      const std::string* res = static_cast<std::string*>(my_mailbox->get());
       XBT_INFO("Host \"%u\" received \"%s\"", rank, res->c_str());
     } else {
       std::string* res = static_cast<std::string*>(my_mailbox->get());
@@ -62,7 +61,7 @@ int main(int argc, char** argv)
   int id = 0;
   std::vector<simgrid::s4u::Host*> list = e.get_all_hosts();
   for (auto const& host : list) {
-    /* - Give a unique rank to each host and create a @ref relay_runner process on each */
+    /* - Give a unique rank to each host and create a @ref relay_runner actor on each */
     simgrid::s4u::Actor::create((std::to_string(id)).c_str(), host, RelayRunner());
     id++;
   }