Fix timing of Vivaldi/two_peers.xml tests

In this platform file, the communication is bounded by the big latency
between nodes (as consequence of the distance between vivaldi
coordinates).

Therefore, we now apply the bandwidth factor (0.97) on top of this
time, delaying a little the communications.

diff --git a/examples/c/app-token-ring/app-token-ring.tesh b/examples/c/app-token-ring/app-token-ring.tesh
index 8f68d1d..802b90d 100644 (file)
--- a/examples/c/app-token-ring/app-token-ring.tesh
+++ b/examples/c/app-token-ring/app-token-ring.tesh
@@ -19,10 +19,11 @@ $ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:
 $ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n"
 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
-> [    0.624423] (1@100036570) Host "1" received "Token"
-> [    0.624423] (1@100036570) Host "1" send 'Token' to Host "0"
-> [    1.248846] (0@100030591) Host "0" received "Token"
-> [    1.248846] (maestro@) Simulation time 1.24885
+> [    0.625106] (1@100036570) Host "1" received "Token"
+> [    0.625106] (1@100036570) Host "1" send 'Token' to Host "0"
+> [    1.250212] (0@100030591) Host "0" received "Token"
+> [    1.250212] (maestro@) Simulation time 1.25021
+
 
 $ ${bindir:=.}/c-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n"
 > [  0.000000] (maestro@) Number of hosts '60'

diff --git a/examples/cpp/app-token-ring/s4u-app-token-ring.tesh b/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
index 76fb5f8..1101a9f 100644 (file)
--- a/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
+++ b/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
@@ -19,10 +19,10 @@ $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fm
 $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n"
 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
-> [    0.624423] (1@100036570) Host "1" received "Token"
-> [    0.624423] (1@100036570) Host "1" send 'Token' to Host "0"
-> [    1.248846] (0@100030591) Host "0" received "Token"
-> [    1.248846] (maestro@) Simulation time 1.24885
+> [    0.625106] (1@100036570) Host "1" received "Token"
+> [    0.625106] (1@100036570) Host "1" send 'Token' to Host "0"
+> [    1.250212] (0@100030591) Host "0" received "Token"
+> [    1.250212] (maestro@) Simulation time 1.25021
 
 $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n"
 > [  0.000000] (maestro@) Number of hosts '60'

diff --git a/examples/deprecated/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
index 1b0626d..3972847 100644 (file)
--- a/examples/deprecated/java/app/tokenring/app-tokenring.tesh
+++ b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
@@ -22,11 +22,11 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/..
 > [    0.000000] (0:maestro@) Using regular java threads.
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@100030591) Host '0' send 'Token' to Host '1'
-> [    0.624423] (2:1@100036570) Host '1' received 'Token'
-> [    0.624423] (2:1@100036570) Host '1' send 'Token' to Host '0'
-> [    1.248846] (1:0@100030591) Host '0' received 'Token'
-> [    1.248846] (0:maestro@) Terminating the simulation...
-> [    1.248846] (0:maestro@) Simulation time 1.2488464578972847
+> [    0.625106] (2:1@100036570) Host '1' received 'Token'
+> [    0.625106] (2:1@100036570) Host '1' send 'Token' to Host '0'
+> [    1.250212] (1:0@100030591) Host '0' received 'Token'
+> [    1.250212] (0:maestro@) Terminating the simulation...
+> [    1.250212] (0:maestro@) Simulation time 1.250212042288475
 
 $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.