X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..631145c79d9036f57360c618a9651930bf65453c:/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 009c9fadf6..06731252ef 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-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-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. */
@@ -18,69 +18,73 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_wait, "Messages specific for this s4u example");
 
-static int sender(int argc, char** argv)
+static void sender(int argc, char** argv)
 {
-  xbt_assert(argc == 4, "Expecting 3 parameters from the XML deployment file but got %d", argc);
+  xbt_assert(argc == 3, "Expecting 2 parameters from the XML deployment file but got %d", argc);
   long messages_count  = std::stol(argv[1]); /* - number of tasks */
-  double msg_size      = std::stol(argv[2]); /* - communication cost in bytes */
-  long receivers_count = std::stod(argv[3]); /* - number of receivers */
+  double msg_size         = std::stod(argv[2]); /* - communication cost in bytes */
+  double sleep_start_time = 5.0;
+  double sleep_test_time  = 0;
 
-  /* Vector in which we store all ongoing communications */
-  std::vector<simgrid::s4u::CommPtr> pending_comms;
+  simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("receiver");
 
-  /* 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)));
+  XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time);
+  simgrid::s4u::this_actor::sleep_for(sleep_start_time);
 
-  /* 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
+    // Copy the data we send: the 'msg_content' variable is not a stable storage location.
+    // It will be destroyed when this actor leaves the loop, ie before the receiver gets the data
     std::string* payload = new std::string(msg_content);
 
-    XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mboxes[i % receivers_count]->get_cname());
-
-    /* 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++) {
-    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("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();
-    pending_comms.pop_back(); // remove it from the list
+    /* Create a communication representing the ongoing communication and then */
+    simgrid::s4u::CommPtr comm = mbox->put_async(payload, msg_size);
+    XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mbox->get_cname());
+
+    if (sleep_test_time > 0) {   /* - "test_time" is set to 0, wait */
+      while (not comm->test()) { /* - Call test() every "sleep_test_time" otherwise */
+        simgrid::s4u::this_actor::sleep_for(sleep_test_time);
+      }
+    } else {
+      comm->wait();
+    }
   }
 
-  XBT_INFO("Goodbye now!");
-  return 0;
+  /* Send message to let the receiver know that it should stop */
+  XBT_INFO("Send 'finalize' to 'receiver'");
+  mbox->put(new std::string("finalize"), 0);
 }
 
 /* Receiver actor expects 1 argument: its ID */
-static int receiver(int argc, char** argv)
+static void receiver(int argc, char** argv)
 {
-  xbt_assert(argc == 2, "Expecting one parameter from the XML deployment file but got %d", argc);
-  simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(std::string("receiver-") + argv[1]);
+  double sleep_start_time = 1.0;
+  double sleep_test_time  = 0.1;
+
+  simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("receiver");
+
+  XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time);
+  simgrid::s4u::this_actor::sleep_for(sleep_start_time);
 
   XBT_INFO("Wait for my first message");
   for (bool cont = true; cont;) {
-    std::string* received = static_cast<std::string*>(mbox->get());
+    void* payload;
+    simgrid::s4u::CommPtr comm = mbox->get_async(&payload);
+
+    if (sleep_test_time > 0) {   /* - "test_time" is set to 0, wait */
+      while (not comm->test()) { /* - Call test() every "sleep_test_time" otherwise */
+        simgrid::s4u::this_actor::sleep_for(sleep_test_time);
+      }
+    } else {
+      comm->wait();
+    }
+
+    std::string* received = static_cast<std::string*>(payload);
     XBT_INFO("I got a '%s'.", received->c_str());
     if (*received == "finalize")
       cont = false; // If it's a finalize message, we're done.
     delete received;
   }
-  return 0;
 }
 
 int main(int argc, char *argv[])