Don't create mailbox before engine is turned on.

diff --git a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.cpp b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.cpp
index ca8436c..96f8b27 100644 (file)
--- a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.cpp
+++ b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.cpp
@@ -15,12 +15,10 @@ const int payload            = 1000;
 const int nb_message_to_send = 5;
 const int nb_sender = 2;
 
-int nb_messages_sent = 0;
-
-simgrid::s4u::Mailbox* box = simgrid::s4u::Mailbox::by_name("test");
-
 static void test_send()
 {
+  simgrid::s4u::Mailbox* box  = simgrid::s4u::Mailbox::by_name("test");
+  static int nb_messages_sent = 0;
   for (int nb_message = 0; nb_message < nb_message_to_send; nb_message++) {
     nb_messages_sent++;
     XBT_VERB("start sending test #%i", nb_messages_sent);
@@ -31,6 +29,7 @@ static void test_send()
 
 static void test_receive()
 {
+  simgrid::s4u::Mailbox* box = simgrid::s4u::Mailbox::by_name("test");
   for (int nb_message = 0; nb_message < nb_message_to_send * nb_sender; nb_message++) {
     XBT_VERB("waiting for messages");
     auto ptr = box->get_unique<int>();

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 e982860..e90bdc4 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
@@ -16,11 +16,9 @@ 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 = simgrid::s4u::Mailbox::by_name("test");
-
 static void test_send(){
+  simgrid::s4u::Mailbox* box  = simgrid::s4u::Mailbox::by_name("test");
+  static int nb_messages_sent = 0;
   for (int nb_message = 0; nb_message < nb_message_to_send; nb_message++) {
     nb_messages_sent++;
     XBT_VERB("start sending test #%i", nb_messages_sent);
@@ -31,6 +29,7 @@ static void test_send(){
 }
 
 static void test_receive(){
+  simgrid::s4u::Mailbox* box = simgrid::s4u::Mailbox::by_name("test");
   for (int nb_message = 0; nb_message < nb_message_to_send * nb_sender; nb_message++) {
     XBT_VERB("waiting for messages");
     auto ptr = box->get_unique<int>();