From: Bruno Donassolo <bruno.donassolo@inria.fr>
Date: Mon, 31 May 2021 08:18:41 +0000 (+0200)
Subject: Fix timing of Wi-Fi tests.
X-Git-Tag: v3.28~127^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ac7cee7dc87add609222b2ace840666c0539a8b1?hp=736ebbd7b83536bb97edcf32f92721a9cde73bb9

Fix timing of Wi-Fi tests.

Their timing were calculated considering that no factor were applied in
Wi-Fi communications.
This isn't the case anymore, since by default, we would apply the 0.97
factor from LV08 to these communications.
Setting CM02 as base network model since it doesn't apply any bandwidth
factor.
---

diff --git a/examples/cpp/network-wifi/s4u-network-wifi.tesh b/examples/cpp/network-wifi/s4u-network-wifi.tesh
index 0cb06ba95f..980f6bd878 100644
--- a/examples/cpp/network-wifi/s4u-network-wifi.tesh
+++ b/examples/cpp/network-wifi/s4u-network-wifi.tesh
@@ -1,6 +1,7 @@
 #!/usr/bin/env tesh
 
-$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (1:sender@Station 1) Send a message to the other station.
 > [  0.000000] (2:receiver@Station 2) Wait for a message.
 > [  3.888889] (1:sender@Station 1) Done.
diff --git a/teshsuite/models/wifi_usage/wifi_usage.tesh b/teshsuite/models/wifi_usage/wifi_usage.tesh
index 68e67a5357..8b96647881 100644
--- a/teshsuite/models/wifi_usage/wifi_usage.tesh
+++ b/teshsuite/models/wifi_usage/wifi_usage.tesh
@@ -1,7 +1,8 @@
 #!/usr/bin/env tesh
 
 p Test WITH crosstraffic
-$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n
+$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/model:CM02
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -22,8 +23,9 @@ $ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n
 > Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000311 seconds.
 
 p Test WITHOUT crosstraffic
-$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0
+$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0 --cfg=network/model:CM02
 > Configuration change: Set 'network/crosstraffic' to '0'
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
diff --git a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
index f1208fd8cd..b2fa6a93b8 100644
--- a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
+++ b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
@@ -1,7 +1,8 @@
 #!/usr/bin/env tesh
 
 p Test WITH crosstraffic
-$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n
+$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/model:CM02
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -24,8 +25,9 @@ $ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n
 > Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000343 seconds.
 
 p Test WITHOUT crosstraffic
-$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0
+$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0 --cfg=network/model:CM02
 > Configuration change: Set 'network/crosstraffic' to '0'
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -44,4 +46,4 @@ $ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=n
 > However, decay model specify that for 2 stations, we have 54Mbps become 49.00487
 >   mu = 1 / [ 1/2 * 1/49.00487Mbps + 1/49.00487Mbps ] = 49004870
 >   simulation_time = 1000*8 / [ mu / 2 ] =  0.0003264982s (rounded to 0.000326s in SimGrid)
-> Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000326 seconds.
\ No newline at end of file
+> Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000326 seconds.