Cosmetics in the messages of this test; no timing change

diff --git a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw-bmf.tesh b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw-bmf.tesh
index ec417c8..c15da1c 100644 (file)
--- a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw-bmf.tesh
+++ b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw-bmf.tesh
@@ -5,17 +5,17 @@ $ ${bindir:=.}/cm02-set-lat-bw  "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --cf
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/weight-S' to '20537'
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/crosstraffic' to '0'
-> [  0.000000] [1:@S1] Comm to C1, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
-> [  0.000000] [3:@S2] Comm to C2, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
+> [  0.000000] [1:@S1] Send to C1, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
+> [  0.000000] [3:@S2] Send to C2, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
 > [  2.000000] [2:@C1] Received data. Elapsed 2.000000
 > [  2.000000] [4:@C2] Received data. Elapsed 2.000000
-> [ 10.000000] [3:@S2] Comm Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)
+> [ 10.000000] [3:@S2] Send Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)
 > [ 10.000000] [3:@S2] rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B
-> [ 10.000000] [1:@S1] Comm Flow A to C1
+> [ 10.000000] [1:@S1] Send Flow A to C1
 > [ 11.753312] [2:@C1] Received data. Elapsed 1.753312
 > [ 12.000000] [4:@C2] Received data. Elapsed 2.000000
-> [ 20.000000] [1:@S1] Comm Flow A to C1
-> [ 20.000000] [3:@S2] Comm Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)
+> [ 20.000000] [1:@S1] Send Flow A to C1
+> [ 20.000000] [3:@S2] Send Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)
 > [ 20.000000] [3:@S2] rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B
 > [ 21.750000] [2:@C1] Received data. Elapsed 1.750000
 > [ 22.000000] [4:@C2] Received data. Elapsed 2.000000

diff --git a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.cpp b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.cpp
index e3a4f91..5f2c22e 100644 (file)
--- a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.cpp
+++ b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.cpp
@@ -37,7 +37,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(cm02_set_lat_bw, "Messages specific for this simula
 static void sender(const std::string& recv_name, sg4::Link* l4)
 {
   sg4::Mailbox* mbox = sg4::Mailbox::by_name(recv_name);
-  XBT_INFO("Comm to %s, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at "
+  XBT_INFO("Send to %s, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at "
            "the same time",
            recv_name.c_str());
   auto* payload = new double(sg4::Engine::get_clock());
@@ -46,10 +46,10 @@ static void sender(const std::string& recv_name, sg4::Link* l4)
   sg4::this_actor::sleep_until(10); // synchronize senders
 
   if (recv_name == "C2") {
-    XBT_INFO("Comm Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)");
+    XBT_INFO("Send Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)");
     XBT_INFO("rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B");
   } else {
-    XBT_INFO("Comm Flow A to C1");
+    XBT_INFO("Send Flow A to C1");
   }
   payload = new double(sg4::Engine::get_clock());
   comm    = mbox->put_async(payload, 1e3);
@@ -62,10 +62,10 @@ static void sender(const std::string& recv_name, sg4::Link* l4)
     l4->set_latency(1e-9);
 
   if (recv_name == "C2") {
-    XBT_INFO("Comm Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)");
+    XBT_INFO("Send Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)");
     XBT_INFO("rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B");
   } else {
-    XBT_INFO("Comm Flow A to C1");
+    XBT_INFO("Send Flow A to C1");
   }
   payload = new double(sg4::Engine::get_clock());
   comm    = mbox->put_async(payload, 1e3);

diff --git a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.tesh b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.tesh
index 760b4ca..57aafa9 100644 (file)
--- a/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.tesh
+++ b/teshsuite/models/cm02-set-lat-bw/cm02-set-lat-bw.tesh
@@ -4,17 +4,17 @@ $ ${bindir:=.}/cm02-set-lat-bw  "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/weight-S' to '20537'
 > [  0.000000] [0:maestro@] Configuration change: Set 'network/crosstraffic' to '0'
-> [  0.000000] [1:@S1] Comm to C1, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
-> [  0.000000] [3:@S2] Comm to C2, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
+> [  0.000000] [1:@S1] Send to C1, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
+> [  0.000000] [3:@S2] Send to C2, same weight/penalty (w_a == w_b, ~20) for everybody, each comm should take 1s and finish at the same time
 > [  2.000000] [2:@C1] Received data. Elapsed 2.000000
 > [  2.000000] [4:@C2] Received data. Elapsed 2.000000
-> [ 10.000000] [3:@S2] Comm Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)
+> [ 10.000000] [3:@S2] Send Flow B to C2: after 1s, change latency of L4 to increase penalty for flow B (w_b = 2* w_a)
 > [ 10.000000] [3:@S2] rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B
-> [ 10.000000] [1:@S1] Comm Flow A to C1
+> [ 10.000000] [1:@S1] Send Flow A to C1
 > [ 11.753312] [2:@C1] Received data. Elapsed 1.753312
 > [ 12.000000] [4:@C2] Received data. Elapsed 2.000000
-> [ 20.000000] [1:@S1] Comm Flow A to C1
-> [ 20.000000] [3:@S2] Comm Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)
+> [ 20.000000] [1:@S1] Send Flow A to C1
+> [ 20.000000] [3:@S2] Send Flow B to C2: after 1s, change bandwidth of L4 to increase penalty for flow B (w_b = 2* w_a)
 > [ 20.000000] [3:@S2] rho_a = 2*rho_b, flow A receives twice the bandwidth than flow B
 > [ 21.750000] [2:@C1] Received data. Elapsed 1.750000
 > [ 22.000000] [4:@C2] Received data. Elapsed 2.000000