NS3 tests: reduce the amount of exchanged data to speed things up

diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml
index b74c49c..e196248 100644 (file)
--- a/examples/msg/network-ns3/3links-timer_d.xml
+++ b/examples/msg/network-ns3/3links-timer_d.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">

-      <argument value="100000"/>
+      <argument value="10000"/>

       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>


@@ -10,7 +10,7 @@
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="Ginette"/>
       <argument value="2"/>
   </process>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>


@@ -18,7 +18,7 @@
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">

-      <argument value="2000000"/>
+      <argument value="10000"/>

       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>


@@ -26,7 +26,7 @@
     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">
     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">

-      <argument value="2000000"/>
+      <argument value="10000"/>

       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>

diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml
index 2aa4d11..37ea1f8 100644 (file)
--- a/examples/msg/network-ns3/3links_d.xml
+++ b/examples/msg/network-ns3/3links_d.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">

-      <argument value="100000"/>
+      <argument value="10000"/>

       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>


@@ -10,7 +10,7 @@
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="Ginette"/>
       <argument value="2"/>
   </process>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>


@@ -18,7 +18,7 @@
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">

-      <argument value="2000000"/>
+      <argument value="10000"/>

       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>

diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml
index 95d99dd..14efa41 100644 (file)
--- a/examples/msg/network-ns3/crosstraffic_d.xml
+++ b/examples/msg/network-ns3/crosstraffic_d.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="C1"/>
       <argument value="1"/>
   </process>
       <argument value="C1"/>
       <argument value="1"/>
   </process>


@@ -10,7 +10,7 @@
     <argument value="1"/>
   </process>
   <process host="S1" function="master">
     <argument value="1"/>
   </process>
   <process host="S1" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="C1"/>
       <argument value="2"/>
   </process>
       <argument value="C1"/>
       <argument value="2"/>
   </process>


@@ -18,7 +18,7 @@
     <argument value="2"/>
   </process>
   <process host="S1" function="master">
     <argument value="2"/>
   </process>
   <process host="S1" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="C1"/>
       <argument value="3"/>
   </process>
       <argument value="C1"/>
       <argument value="3"/>
   </process>


@@ -26,7 +26,7 @@
     <argument value="3"/>
   </process>
   <process host="C1" function="master">
     <argument value="3"/>
   </process>
   <process host="C1" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="S1"/>
       <argument value="4"/>
   </process>
       <argument value="S1"/>
       <argument value="4"/>
   </process>

diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml
index 4288e63..803a4f8 100644 (file)
--- a/examples/msg/network-ns3/dogbone_d.xml
+++ b/examples/msg/network-ns3/dogbone_d.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="20000000"/>
+      <argument value="10000"/>

       <argument value="C1"/>
       <argument value="0"/>
   </process>
   <process host="S2" function="master">
       <argument value="C1"/>
       <argument value="0"/>
   </process>
   <process host="S2" function="master">

-      <argument value="20000000"/>
+      <argument value="10000"/>

       <argument value="C2"/>
       <argument value="1"/>
   </process>
       <argument value="C2"/>
       <argument value="1"/>
   </process>

diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh
index 33a67e0..686cb46 100644 (file)
--- 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'
 
 $ 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'
 
 $ 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
 
 
 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'
 ! 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'
 
 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 
 
 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 39113f5..eaaafc6 100644 (file)
--- a/examples/msg/network-ns3/onelink_d.xml
+++ b/examples/msg/network-ns3/onelink_d.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="1000000"/>
+      <argument value="10000"/>

       <argument value="C1"/>
       <argument value="1"/>
   </process>
       <argument value="C1"/>
       <argument value="1"/>
   </process>