X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c008c8141b0ef7654f2c855bdcdf1a8f905c45e0..e542387cf6c22f2cf646faede87320040dbaa884:/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 02147a9906..274201af95 100644
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/token_ring/token_ring.tesh
@@ -1,36 +1,34 @@
 #! ./tesh
 
-! output sort
 $ $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:@) 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.242880] (2:slave@bob3.hamburger.edu) Send Data to "host2"
-> [  0.242880] (3:slave@alice2.crepe.fr) Received "Token"
-> [  0.309120] (3:slave@alice2.crepe.fr) Send Data to "host3"
-> [  0.309120] (4:slave@alice3.crepe.fr) Received "Token"
-> [  0.485760] (4:slave@alice3.crepe.fr) Send Data to "host4"
-> [  0.485760] (5:slave@bob0.hamburger.edu) Received "Token"
-> [  0.552000] (5:slave@bob0.hamburger.edu) Send Data to "host5"
-> [  0.552000] (6:slave@bob2.hamburger.edu) Received "Token"
-> [  0.618240] (6:slave@bob2.hamburger.edu) Send Data to "host6"
-> [  0.618240] (7:slave@bob4.hamburger.edu) Received "Token"
-> [  0.794880] (7:slave@bob4.hamburger.edu) Send Data to "host7"
-> [  0.794880] (8:slave@alice0.crepe.fr) Received "Token"
-> [  0.861120] (8:slave@alice0.crepe.fr) Send Data to "host8"
-> [  0.861120] (9:slave@alice4.crepe.fr) Received "Token"
-> [  0.927360] (10:slave@alice1.crepe.fr) Received "Token"
-> [  0.927360] (9:slave@alice4.crepe.fr) Send Data to "host9"
+> [  0.000000] (0:@) Number of host '10'
+> [  0.000000] (1:0@bob1.hamburger.edu) Host "0" send 'Token' to Host "1"
+> [  0.066240] (2:1@bob3.hamburger.edu) Host "1" received "Token"
+> [  0.066240] (2:1@bob3.hamburger.edu) Host "1" send 'Token' to Host "2"
+> [  0.242880] (3:2@alice2.crepe.fr) Host "2" received "Token"
+> [  0.242880] (3:2@alice2.crepe.fr) Host "2" send 'Token' to Host "3"
+> [  0.309120] (4:3@alice3.crepe.fr) Host "3" received "Token"
+> [  0.309120] (4:3@alice3.crepe.fr) Host "3" send 'Token' to Host "4"
+> [  0.485760] (5:4@bob0.hamburger.edu) Host "4" received "Token"
+> [  0.485760] (5:4@bob0.hamburger.edu) Host "4" send 'Token' to Host "5"
+> [  0.552000] (6:5@bob2.hamburger.edu) Host "5" received "Token"
+> [  0.552000] (6:5@bob2.hamburger.edu) Host "5" send 'Token' to Host "6"
+> [  0.618240] (7:6@bob4.hamburger.edu) Host "6" received "Token"
+> [  0.618240] (7:6@bob4.hamburger.edu) Host "6" send 'Token' to Host "7"
+> [  0.794880] (8:7@alice0.crepe.fr) Host "7" received "Token"
+> [  0.794880] (8:7@alice0.crepe.fr) Host "7" send 'Token' to Host "8"
+> [  0.861120] (9:8@alice4.crepe.fr) Host "8" received "Token"
+> [  0.861120] (9:8@alice4.crepe.fr) Host "8" send 'Token' to Host "9"
+> [  0.927360] (10:9@alice1.crepe.fr) Host "9" received "Token"
+> [  0.927360] (10:9@alice1.crepe.fr) Host "9" send 'Token' to Host "0"
+> [  1.104000] (1:0@bob1.hamburger.edu) Host "0" received "Token"
 > [  1.104000] (0:@) Simulation time 1.104
-> [  1.104000] (10:slave@alice1.crepe.fr) Send Data to "host0"
-> [  1.104000] (1:master@bob1.hamburger.edu) Received "Token"
 
-! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    0.000000] (0:@) Configuration change: Set 'coordinates' to 'yes'
-> [    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.
-> [    5.221778] (1:master@peer_100030591) Send Data to "host1"
-> [    5.221778] (2:slave@peer_100036570) Received "Token"
-> [   10.443556] (0:@) Simulation time 10.4436
-> [   10.443556] (1:master@peer_100030591) Received "Token"
-> [   10.443556] (2:slave@peer_100036570) Send Data to "host0"
\ No newline at end of file
+> [    0.000000] (0:@) Number of host '2'
+> [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
+> [    0.110400] (2:1@peer_100036570) Host "1" received "Token"
+> [    0.110400] (2:1@peer_100036570) Host "1" send 'Token' to Host "0"
+> [    0.220800] (1:0@peer_100030591) Host "0" received "Token"
+> [    0.220800] (0:@) Simulation time 0.2208
\ No newline at end of file