reduce the verbosity of this test and increase its effectiveness

[simgrid.git] / teshsuite / s4u / ns3-simultaneous-send-rcv / ns3-simultaneous-send-rcv.cpp

diff --git a/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.cpp b/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.cpp
index 65fbbfe..b7a4de5 100644 (file)
--- a/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.cpp
+++ b/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.cpp
@@ -1,42 +1,42 @@
+/* Copyright (c) 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. */
+
+/* This test checks that ns-3 behave correctly when multiple flows finish   */
+/* at the exact same time. Given the amount of simultaneous senders, it     */
+/* also serves as a (small) crash test for ns-3.                            */
+
 #include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u tests");
 
-int payload = 1000;
-int nb_message_to_send = 100;
-double sleep_time = 1;
-int nb_sender = 50;
+const int payload            = 1000;
+const int nb_message_to_send = 5;
+const double sleep_time      = 5;
+const int nb_sender          = 100;
 
 int nb_messages_sent = 0;
 
 simgrid::s4u::Mailbox* box;
 
 static void test_send(){
-
-  int nb_message = 0;
-
-  while(nb_message < nb_message_to_send){
-    
+  for (int nb_message = 0; nb_message < nb_message_to_send; nb_message++) {
     nb_messages_sent++;
-    nb_message++;
-    int id_message = nb_messages_sent;
-    XBT_INFO("start sending test #%i", id_message); 
-    box->put(new int(id_message), payload);
-    XBT_INFO("done sending test #%i", id_message);
-    simgrid::s4u::this_actor::sleep_for(sleep_time);
+    XBT_VERB("start sending test #%i", nb_messages_sent);
+    box->put(new int(nb_messages_sent), payload);
+    XBT_VERB("done sending test #%i", nb_messages_sent);
+    simgrid::s4u::this_actor::sleep_until(sleep_time * (nb_message + 1));
   }
 }
 
 static void test_receive(){
-
-  int nb_message = 0;
-
-  while(nb_message < nb_message_to_send * nb_sender){
-    XBT_INFO("waiting for messages");
+  for (int nb_message = 0; nb_message < nb_message_to_send * nb_sender; nb_message++) {
+    XBT_VERB("waiting for messages");
     int id = *(int*)(box->get());
-    nb_message++;
-    XBT_INFO("received messages #%i", id);
+    XBT_VERB("received messages #%i", id);
   }
+  XBT_INFO("Done receiving from %d senders, each of them sending %d messages", nb_sender, nb_message_to_send);
 }
 
 
@@ -46,11 +46,11 @@ int main(int argc, char *argv[])
  
   e.load_platform(argv[1]);
 
-  for(int i=0;i<nb_sender;i++)
-    simgrid::s4u::Actor::create("sender_"+std::to_string(i), e.get_all_hosts()[i], test_send);
+  simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", e.get_all_hosts()[0], test_receive);
+  for (int i = 0; i < nb_sender; i++)
+    simgrid::s4u::Actor::create("sender_" + std::to_string(i), e.get_all_hosts()[i % (e.get_host_count() - 1) + 1],
+                                test_send);
 
-  simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", e.get_all_hosts()[nb_sender+1], test_receive);
-  
   box = simgrid::s4u::Mailbox::by_name("test");
   box->set_receiver(receiver);