X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8169282cca06266967c585e8619feed5a3905117..7ac777931e588a2a48708ac16caeb50973f2cdf9:/teshsuite/s4u/comm-waitany/comm-waitany.cpp

diff --git a/teshsuite/s4u/comm-waitany/comm-waitany.cpp b/teshsuite/s4u/comm-waitany/comm-waitany.cpp
index 1f67aa0941..6b9658317b 100644
--- a/teshsuite/s4u/comm-waitany/comm-waitany.cpp
+++ b/teshsuite/s4u/comm-waitany/comm-waitany.cpp
@@ -1,50 +1,50 @@
+/* Copyright (c) 2017. 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. */
+
 #include <iostream>
 #include <simgrid/s4u.hpp>
 #include <stdlib.h>
 #include <vector>
 
-#define NUM_COMMS 10
+#define NUM_COMMS 1
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(mwe, "Minimum Working Example");
 
 static void receiver()
 {
-  simgrid::s4u::MailboxPtr mymailbox    = simgrid::s4u::Mailbox::byName("receiver_mailbox");
-  simgrid::s4u::MailboxPtr theirmailbox = simgrid::s4u::Mailbox::byName("sender_mailbox");
+  simgrid::s4u::MailboxPtr mymailbox = simgrid::s4u::Mailbox::byName("receiver_mailbox");
 
   std::vector<simgrid::s4u::CommPtr> pending_comms;
 
   XBT_INFO("Placing %d asynchronous recv requests", NUM_COMMS);
-  void* data = calloc(1, sizeof(int));
+  void* data;
   for (int i = 0; i < NUM_COMMS; i++) {
-    simgrid::s4u::CommPtr comm = simgrid::s4u::Comm::recv_async(mymailbox, &data);
+    simgrid::s4u::CommPtr comm = mymailbox->get_async(&data);
     pending_comms.push_back(comm);
   }
 
-  XBT_INFO("Sleeping for 100 seconds...");
-  simgrid::s4u::this_actor::sleep_for(100.0);
-  XBT_INFO("Calling wait_any() for %ld pending comms", pending_comms.size());
-  std::vector<simgrid::s4u::CommPtr>::iterator ret_it =
-      simgrid::s4u::Comm::wait_any(pending_comms.begin(), pending_comms.end());
-  XBT_INFO("Counting the number of completed comms...");
-
-  int count = 0;
-  for (; ret_it != pending_comms.end(); count++, ret_it++)
-    ;
+  for (int i = 0; i < NUM_COMMS; i++) {
+    XBT_INFO("Sleeping for 3 seconds (for the %dth time)...", i + 1);
+    simgrid::s4u::this_actor::sleep_for(3.0);
+    XBT_INFO("Calling wait_any() for %zu pending comms", pending_comms.size());
+    int changed_pos = simgrid::s4u::Comm::wait_any(&pending_comms);
+    XBT_INFO("Counting the number of completed comms...");
 
-  xbt_assert(count == 1, "wait_any() replied that %d comms have completed, which is broken!", count);
+    pending_comms.erase(pending_comms.begin() + changed_pos);
+  }
 }
 
 static void sender()
 {
-  simgrid::s4u::MailboxPtr mymailbox    = simgrid::s4u::Mailbox::byName("sender_mailbox");
   simgrid::s4u::MailboxPtr theirmailbox = simgrid::s4u::Mailbox::byName("receiver_mailbox");
 
-  void* data = calloc(1, sizeof(int));
+  void* data = (void*)"data";
 
   for (int i = 0; i < NUM_COMMS; i++) {
     XBT_INFO("Sending a message to the receiver");
-    simgrid::s4u::this_actor::send(theirmailbox, &data, 4);
+    theirmailbox->put(&data, 4);
     XBT_INFO("Sleeping for 1000 seconds");
     simgrid::s4u::this_actor::sleep_for(1000.0);
   }
@@ -55,18 +55,16 @@ int main(int argc, char** argv)
 
   simgrid::s4u::Engine* engine = new simgrid::s4u::Engine(&argc, argv);
 
-  if (argc < 2) {
-    std::cerr << "Usage: " << argv[0] << " <xml platform file>" << std::endl;
-    exit(1);
-  }
+  xbt_assert(argc >= 2, "Usage: %s <xml platform file>", argv[0]);
 
   engine->loadPlatform(argv[1]);
-  simgrid::s4u::Host* host = simgrid::s4u::Host::by_name("Tremblay");
-
-  simgrid::s4u::Actor::createActor("Receiver", host, receiver);
-  simgrid::s4u::Actor::createActor("Sender", host, sender);
+  simgrid::s4u::Host** hosts = sg_host_list();
+  simgrid::s4u::Actor::createActor("Receiver", hosts[0], receiver);
+  simgrid::s4u::Actor::createActor("Sender", hosts[1], sender);
+  xbt_free(hosts);
 
-  simgrid::s4u::Engine::instance()->run();
+  engine->run();
 
+  delete engine;
   return 0;
 }