X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d117a5908ecb0e19765890a3607ccedd81de2fa..267c4af6fe5522d2d291f2c99e8225827268cdff:/examples/s4u/async-waitall/s4u-async-waitall.cpp

diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index de61d34a3e..270894fe6e 100644
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -13,90 +13,87 @@
  */
 
 #include "simgrid/s4u.hpp"
-#include "xbt/str.h"
 #include <cstdlib>
 #include <iostream>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example");
 
-class sender {
-  long messages_count;
-  long receivers_count;
-  double msg_size; /* in bytes */
+class Sender {
+  long messages_count;  /* - number of tasks */
+  long receivers_count; /* - number of receivers */
+  double msg_size;      /* - communication cost in bytes */
 
 public:
-  explicit sender(std::vector<std::string> args)
-{
-  xbt_assert(args.size() == 4, "This function expects 4 parameters from the XML deployment file but got %zu",
-             args.size());
-  messages_count  = std::stol(args[1]);
-  msg_size        = std::stod(args[2]);
-  receivers_count = std::stol(args[3]);
-}
-void operator()()
-{
-  std::vector<simgrid::s4u::CommPtr>* pending_comms = new std::vector<simgrid::s4u::CommPtr>();
-
-  /* Start dispatching all messages to receivers, in a round robin fashion */
-  for (int i = 0; i < messages_count; i++) {
+  explicit Sender(std::vector<std::string> args)
+  {
+    xbt_assert(args.size() == 4, "Expecting 3 parameters from the XML deployment file but got %zu", args.size());
+    messages_count  = std::stol(args[1]);
+    msg_size        = std::stod(args[2]);
+    receivers_count = std::stol(args[3]);
+  }
+  void operator()()
+  {
+    std::vector<simgrid::s4u::CommPtr> pending_comms;
+
+    /* Start dispatching all messages to receivers, in a round robin fashion */
+    for (int i = 0; i < messages_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 msgName           = std::string("Message ") + std::to_string(i);
+      char* payload = xbt_strdup(msgName.c_str()); // 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((void*)payload, msg_size);
+      /* Add this comm to the vector of all known comms */
+      pending_comms.push_back(comm);
+    }
 
-    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);
-    char* payload = xbt_strdup(msgName.c_str()); // copy the data we send: 'msgName' is not a stable storage location
+    /* 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);
+      char* payload                 = xbt_strdup("finalize"); // Make a copy of the data we will send
 
-    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((void*)payload, msg_size);
-    /* Add this comm to the vector of all known comms */
-    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 mbox_name         = std::string("receiver-") + std::to_string(i % receivers_count);
-    simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mbox_name);
-    char* payload                 = xbt_strdup("finalize"); // Make a copy of the data we will send
-
-    simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, 0);
-    pending_comms->push_back(comm);
-    XBT_INFO("Send 'finalize' to 'receiver-%ld'", i % receivers_count);
-  }
-  XBT_INFO("Done dispatching all messages");
+      simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, 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 one single call */
-  simgrid::s4u::Comm::wait_all(pending_comms);
+    /* Now that all message exchanges were initiated, wait for their completion in one single call */
+    simgrid::s4u::Comm::wait_all(&pending_comms);
 
-  XBT_INFO("Goodbye now!");
-  delete pending_comms;
-}
+    XBT_INFO("Goodbye now!");
+  }
 };
 
-class receiver {
+/* Receiver actor expects 1 argument: its ID */
+class Receiver {
   simgrid::s4u::MailboxPtr mbox;
 
 public:
-  explicit receiver(std::vector<std::string> args)
-{
-  xbt_assert(args.size() == 2, "This function expects 2 parameters from the XML deployment file but got %zu",
-             args.size());
-  int id = xbt_str_parse_int(args[1].c_str(), "Any process of this example must have a numerical name, not %s");
-  std::string mbox_name = std::string("receiver-") + std::to_string(id);
-  mbox                  = simgrid::s4u::Mailbox::byName(mbox_name);
-}
-void operator()()
-{
-  XBT_INFO("Wait for my first message");
-  while (1) {
-    char* received = static_cast<char*>(mbox->get());
-    XBT_INFO("I got a '%s'.", received);
-    if (std::strcmp(received, "finalize") == 0) { /* If it's a finalize message, we're done */
+  explicit Receiver(std::vector<std::string> args)
+  {
+    xbt_assert(args.size() == 2, "Expecting one parameter from the XML deployment file but got %zu", args.size());
+    std::string mboxName = std::string("receiver-") + args[1];
+    mbox                 = simgrid::s4u::Mailbox::byName(mboxName);
+  }
+  void operator()()
+  {
+    XBT_INFO("Wait for my first message");
+    while (1) {
+      char* received = static_cast<char*>(mbox->get());
+      XBT_INFO("I got a '%s'.", received);
+      if (std::strcmp(received, "finalize") == 0) { /* If it's a finalize message, we're done */
+        xbt_free(received);
+        break;
+      }
+      /* Otherwise receiving the message was all we were supposed to do */
       xbt_free(received);
-      break;
     }
-    /* Otherwise receiving the message was all we were supposed to do */
-    xbt_free(received);
   }
-}
 };
 
 int main(int argc, char *argv[])
@@ -104,8 +101,8 @@ int main(int argc, char *argv[])
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]);
 
   simgrid::s4u::Engine e(&argc, argv);
-  e.registerFunction<sender>("sender");
-  e.registerFunction<receiver>("receiver");
+  e.registerFunction<Sender>("sender");
+  e.registerFunction<Receiver>("receiver");
 
   e.loadPlatform(argv[1]);
   e.loadDeployment(argv[2]);