X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c9b55f9c36855549c0a1dc3eae18cd9b520a85e..e6bc6eb53997f4648bf3207348c060e9f50ee282:/examples/msg/token_ring/token_ring.tesh

diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh
index f283d38d82..4708139779 100644
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/token_ring/token_ring.tesh
@@ -1,36 +1,35 @@
 #! ./tesh
 
-! output sort
-$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
-> [  0.066240] (1:master@bob1.hamburger.edu) Send Data to "host1"
-> [  0.066240] (2:slave@bob3.hamburger.edu) Received "Token"
-> [  0.253920] (2:slave@bob3.hamburger.edu) Send Data to "host2"
-> [  0.253920] (3:slave@alice2.crepe.fr) Received "Token"
-> [  0.320160] (3:slave@alice2.crepe.fr) Send Data to "host3"
-> [  0.320160] (4:slave@alice3.crepe.fr) Received "Token"
-> [  0.507840] (4:slave@alice3.crepe.fr) Send Data to "host4"
-> [  0.507840] (5:slave@bob0.hamburger.edu) Received "Token"
-> [  0.574080] (5:slave@bob0.hamburger.edu) Send Data to "host5"
-> [  0.574080] (6:slave@bob2.hamburger.edu) Received "Token"
-> [  0.640320] (6:slave@bob2.hamburger.edu) Send Data to "host6"
-> [  0.640320] (7:slave@bob4.hamburger.edu) Received "Token"
-> [  0.828000] (7:slave@bob4.hamburger.edu) Send Data to "host7"
-> [  0.828000] (8:slave@alice0.crepe.fr) Received "Token"
-> [  0.894240] (8:slave@alice0.crepe.fr) Send Data to "host8"
-> [  0.894240] (9:slave@alice4.crepe.fr) Received "Token"
-> [  0.960480] (10:slave@alice1.crepe.fr) Received "Token"
-> [  0.960480] (9:slave@alice4.crepe.fr) Send Data to "host9"
-> [  1.148160] (0:@) Simulation time 1.14816
-> [  1.148160] (10:slave@alice1.crepe.fr) Send Data to "host0"
-> [  1.148160] (1:master@bob1.hamburger.edu) Received "Token"
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:@) Number of host '10'
+> [  0.000000] (1:0@bob1.hamburger.edu) Host "0" send 'Token' to Host "1"
+> [  0.067806] (2:1@bob3.hamburger.edu) Host "1" received "Token"
+> [  0.067806] (2:1@bob3.hamburger.edu) Host "1" send 'Token' to Host "2"
+> [  0.248622] (3:2@alice2.crepe.fr) Host "2" received "Token"
+> [  0.248622] (3:2@alice2.crepe.fr) Host "2" send 'Token' to Host "3"
+> [  0.316428] (4:3@alice3.crepe.fr) Host "3" received "Token"
+> [  0.316428] (4:3@alice3.crepe.fr) Host "3" send 'Token' to Host "4"
+> [  0.497244] (5:4@bob0.hamburger.edu) Host "4" received "Token"
+> [  0.497244] (5:4@bob0.hamburger.edu) Host "4" send 'Token' to Host "5"
+> [  0.565050] (6:5@bob2.hamburger.edu) Host "5" received "Token"
+> [  0.565050] (6:5@bob2.hamburger.edu) Host "5" send 'Token' to Host "6"
+> [  0.632856] (7:6@bob4.hamburger.edu) Host "6" received "Token"
+> [  0.632856] (7:6@bob4.hamburger.edu) Host "6" send 'Token' to Host "7"
+> [  0.813672] (8:7@alice0.crepe.fr) Host "7" received "Token"
+> [  0.813672] (8:7@alice0.crepe.fr) Host "7" send 'Token' to Host "8"
+> [  0.881478] (9:8@alice4.crepe.fr) Host "8" received "Token"
+> [  0.881478] (9:8@alice4.crepe.fr) Host "8" send 'Token' to Host "9"
+> [  0.949284] (10:9@alice1.crepe.fr) Host "9" received "Token"
+> [  0.949284] (10:9@alice1.crepe.fr) Host "9" send 'Token' to Host "0"
+> [  1.130100] (1:0@bob1.hamburger.edu) Host "0" received "Token"
+> [  1.130100] (0:@) Simulation time 1.1301
 
 
-! output sort
-$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
-> [    0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
-> [ 5111.488529] (1:master@peer_100030591) Send Data to "host1"
-> [ 5111.488529] (2:slave@peer_100036570) Received "Token"
-> [10222.977057] (0:@) Simulation time 10223
-> [10222.977057] (1:master@peer_100030591) Received "Token"
-> [10222.977057] (2:slave@peer_100036570) Send Data to "host0"
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+> [    0.000000] (0:@) Configuration change: Set 'network/coordinates' to 'yes'
+> [    0.000000] (0:@) Number of host '2'
+> [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
+> [    5.345228] (2:1@peer_100036570) Host "1" received "Token"
+> [    5.345228] (2:1@peer_100036570) Host "1" send 'Token' to Host "0"
+> [   10.690456] (1:0@peer_100030591) Host "0" received "Token"
+> [   10.690456] (0:@) Simulation time 10.6905
\ No newline at end of file