these examples should not diverge

diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp
index 91e9224..24ffcbe 100644 (file)
--- a/examples/s4u/async-wait/s4u-async-wait.cpp
+++ b/examples/s4u/async-wait/s4u-async-wait.cpp
@@ -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::MailboxPtr> 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::by_name(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::by_name(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
   }
 

diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index 514c69e..7c7c908 100644 (file)
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -46,7 +46,6 @@ public:
 
     /* 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

diff --git a/examples/s4u/async-waitany/s4u-async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp
index afcbc90..93799e9 100644 (file)
--- a/examples/s4u/async-waitany/s4u-async-waitany.cpp
+++ b/examples/s4u/async-waitany/s4u-async-waitany.cpp
@@ -39,32 +39,33 @@ public:
   }
   void operator()()
   {
+    /* 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::MailboxPtr> 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::by_name(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::by_name(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");