From 2c9b55f9c36855549c0a1dc3eae18cd9b520a85e Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 24 Mar 2011 10:35:12 +0000 Subject: [PATCH 1/1] Update tesh as the SD_get_host_table has change. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9825 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/msg/parallel_task/parallel_task.tesh | 2 +- examples/msg/token_ring/token_ring.tesh | 49 ++++++++++--------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh index 83f267f7ac..ead97106ca 100644 --- a/examples/msg/parallel_task/parallel_task.tesh +++ b/examples/msg/parallel_task/parallel_task.tesh @@ -7,7 +7,7 @@ $ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/small_platform. > [ 0.000000] (0:@) type in variable = 2 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 0.009378] (0:@) Simulation time 0.00937836 -> [ 0.009378] (1:test@Ginette) Goodbye now! +> [ 0.009378] (1:test@Fafard) Goodbye now! ! output sort $ $SG_TEST_EXENV parallel_task/test_ptask$EXEEXT ${srcdir:=.}/parallel_task/test_ptask_platform.xml ${srcdir:=.}/parallel_task/test_ptask_deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index d7d3f0fcf3..f283d38d82 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -3,33 +3,34 @@ ! 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@alice1.crepe.fr) Send Data to "host1" -> [ 0.066240] (2:slave@alice4.crepe.fr) Received "Token" -> [ 0.132480] (2:slave@alice4.crepe.fr) Send Data to "host2" -> [ 0.132480] (3:slave@alice0.crepe.fr) Received "Token" -> [ 0.320160] (3:slave@alice0.crepe.fr) Send Data to "host3" -> [ 0.320160] (4:slave@bob4.hamburger.edu) Received "Token" -> [ 0.386400] (4:slave@bob4.hamburger.edu) Send Data to "host4" -> [ 0.386400] (5:slave@bob2.hamburger.edu) Received "Token" -> [ 0.452640] (5:slave@bob2.hamburger.edu) Send Data to "host5" -> [ 0.452640] (6:slave@bob0.hamburger.edu) Received "Token" -> [ 0.640320] (6:slave@bob0.hamburger.edu) Send Data to "host6" -> [ 0.640320] (7:slave@alice3.crepe.fr) Received "Token" -> [ 0.706560] (7:slave@alice3.crepe.fr) Send Data to "host7" -> [ 0.706560] (8:slave@alice2.crepe.fr) Received "Token" -> [ 0.894240] (8:slave@alice2.crepe.fr) Send Data to "host8" -> [ 0.894240] (9:slave@bob3.hamburger.edu) Received "Token" -> [ 0.960480] (10:slave@bob1.hamburger.edu) Received "Token" -> [ 0.960480] (9:slave@bob3.hamburger.edu) Send Data to "host9" +> [ 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@bob1.hamburger.edu) Send Data to "host0" -> [ 1.148160] (1:master@alice1.crepe.fr) Received "Token" +> [ 1.148160] (10:slave@alice1.crepe.fr) Send Data to "host0" +> [ 1.148160] (1:master@bob1.hamburger.edu) Received "Token" + ! 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_100036570) Send Data to "host1" -> [ 5111.488529] (2:slave@peer_100030591) Received "Token" +> [ 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_100036570) Received "Token" -> [10222.977057] (2:slave@peer_100030591) Send Data to "host0" +> [10222.977057] (1:master@peer_100030591) Received "Token" +> [10222.977057] (2:slave@peer_100036570) Send Data to "host0" -- 2.20.1