X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3721210a272c9593a3bccd52f63178403b5729e3..93e627932e2b4dfb8b7b4e319a820aeda261ceb9:/examples/s4u/async-wait/s4u-async-wait.cpp

diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp
index b2f5a11a7f..009c9fadf6 100644
--- a/examples/s4u/async-wait/s4u-async-wait.cpp
+++ b/examples/s4u/async-wait/s4u-async-wait.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <string>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_wait, "Messages specific for this s4u example");
 
 static int sender(int argc, char** argv)
 {
@@ -25,39 +25,40 @@ static int sender(int argc, char** argv)
   double msg_size      = std::stol(argv[2]); /* - communication cost in bytes */
   long receivers_count = std::stod(argv[3]); /* - number of receivers */
 
+  /* Vector in which we store all ongoing communications */
   std::vector<simgrid::s4u::CommPtr> pending_comms;
 
+  /* Make a vector of the mailboxes to use */
+  std::vector<simgrid::s4u::Mailbox*> mboxes;
+  for (int i = 0; i < receivers_count; i++)
+    mboxes.push_back(simgrid::s4u::Mailbox::by_name(std::string("receiver-") + std::to_string(i)));
+
   /* Start dispatching all messages to receivers, in a round robin fashion */
   for (int i = 0; i < messages_count; i++) {
+    std::string msg_content = std::string("Message ") + std::to_string(i);
+    // Copy the data we send: 'msg_content' is not a stable storage location.
+    // It will be destroyed when this actor leaves the loop, ie before the receiver gets it
+    std::string* payload = new std::string(msg_content);
+
+    XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mboxes[i % receivers_count]->get_cname());
 
-    std::string mboxName          = std::string("receiver-") + std::to_string(i % receivers_count);
-    simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName);
-    std::string msgName           = std::string("Message ") + std::to_string(i);
-    std::string* payload          = new std::string(msgName); // copy the data we send:
-    // 'msgName' is not a stable storage location
-    XBT_INFO("Send '%s' to '%s'", msgName.c_str(), mboxName.c_str());
-    /* Create a communication representing the ongoing communication */
-    simgrid::s4u::CommPtr comm = mbox->put_async(payload, msg_size);
-    /* Add this comm to the vector of all known comms */
+    /* Create a communication representing the ongoing communication, and store it in pending_comms */
+    simgrid::s4u::CommPtr comm = mboxes[i % receivers_count]->put_async(payload, msg_size);
     pending_comms.push_back(comm);
   }
 
   /* Start sending messages to let the workers know that they should stop */
   for (int i = 0; i < receivers_count; i++) {
-    std::string mboxName          = std::string("receiver-") + std::to_string(i % receivers_count);
-    simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName);
-    std::string* payload          = new std::string("finalize"); // Make a copy of the data we will send
-
-    simgrid::s4u::CommPtr comm = mbox->put_async(payload, 0);
+    XBT_INFO("Send 'finalize' to 'receiver-%d'", i);
+    simgrid::s4u::CommPtr comm = mboxes[i]->put_async(new std::string("finalize"), 0);
     pending_comms.push_back(comm);
-    XBT_INFO("Send 'finalize' to 'receiver-%ld'", i % receivers_count);
   }
   XBT_INFO("Done dispatching all messages");
 
   /* Now that all message exchanges were initiated, wait for their completion, in order of creation. */
   while (not pending_comms.empty()) {
     simgrid::s4u::CommPtr comm = pending_comms.back();
-    comm->wait();             // we could provide a timeout as a parameter
+    comm->wait();
     pending_comms.pop_back(); // remove it from the list
   }
 
@@ -69,7 +70,7 @@ static int sender(int argc, char** argv)
 static int receiver(int argc, char** argv)
 {
   xbt_assert(argc == 2, "Expecting one parameter from the XML deployment file but got %d", argc);
-  simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(std::string("receiver-") + argv[1]);
+  simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(std::string("receiver-") + argv[1]);
 
   XBT_INFO("Wait for my first message");
   for (bool cont = true; cont;) {