From b12df5595f7b38aac7747d80bd6a1030043e74f8 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 17 Apr 2016 11:49:06 +0200 Subject: [PATCH] NS3 tests: reduce the amount of exchanged data to speed things up --- examples/msg/network-ns3/3links-timer_d.xml | 8 ++++---- examples/msg/network-ns3/3links_d.xml | 6 +++--- examples/msg/network-ns3/crosstraffic_d.xml | 8 ++++---- examples/msg/network-ns3/dogbone_d.xml | 4 ++-- examples/msg/network-ns3/network-ns3.tesh | 20 ++++++++++---------- examples/msg/network-ns3/onelink_d.xml | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml index b74c49cf41..e196248d3b 100644 --- a/examples/msg/network-ns3/3links-timer_d.xml +++ b/examples/msg/network-ns3/3links-timer_d.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml index 2aa4d1198c..37ea1f8694 100644 --- a/examples/msg/network-ns3/3links_d.xml +++ b/examples/msg/network-ns3/3links_d.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml index 95d99dd329..14efa4115c 100644 --- a/examples/msg/network-ns3/crosstraffic_d.xml +++ b/examples/msg/network-ns3/crosstraffic_d.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml index 4288e6331d..803a4f8261 100644 --- a/examples/msg/network-ns3/dogbone_d.xml +++ b/examples/msg/network-ns3/dogbone_d.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh index 33a67e0c35..686cb46a38 100644 --- a/examples/msg/network-ns3/network-ns3.tesh +++ b/examples/msg/network-ns3/network-ns3.tesh @@ -13,16 +13,16 @@ p 6hosts 3links $ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/network-ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' -> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter -> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette -> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace +> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 10000 bytes from Tremblay to Jupiter +> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 10000 bytes from Fafard to Ginette +> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 10000 bytes from Bourassa to Lovelace $ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/network-ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' -> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter -> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette -> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace -> [Lovelace:worker(7)] [msg_test/INFO] FLOW[4] : Receive 2000000 bytes from Bourassa to Lovelace +> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 10000 bytes from Tremblay to Jupiter +> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 10000 bytes from Fafard to Ginette +> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 10000 bytes from Bourassa to Lovelace +> [Lovelace:worker(7)] [msg_test/INFO] FLOW[4] : Receive 10000 bytes from Bourassa to Lovelace p One cluster @@ -41,14 +41,14 @@ p Dogbone ! timeout 10 $ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/network-ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' -> [C1:worker(3)] [msg_test/INFO] FLOW[0] : Receive 20000000 bytes from S1 to C1 -> [C2:worker(4)] [msg_test/INFO] FLOW[1] : Receive 20000000 bytes from S2 to C2 +> [C1:worker(3)] [msg_test/INFO] FLOW[0] : Receive 10000 bytes from S1 to C1 +> [C2:worker(4)] [msg_test/INFO] FLOW[1] : Receive 10000 bytes from S2 to C2 p 2hosts 1link $ network-ns3/network-ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/network-ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' -> [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1 +> [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 10000 bytes from S1 to C1 p Crosstraffic TCP option DISABLED ! output ignore diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml index 39113f5d90..eaaafc6d3e 100644 --- a/examples/msg/network-ns3/onelink_d.xml +++ b/examples/msg/network-ns3/onelink_d.xml @@ -2,7 +2,7 @@ - + -- 2.20.1