X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c882f48d6847f5f4437f940b6507137a497ab53..ab206a33168719d136a35ad3d066af08dd9482ab:/examples/simdag/metaxml/metaxml_test.tesh

diff --git a/examples/simdag/metaxml/metaxml_test.tesh b/examples/simdag/metaxml/metaxml_test.tesh
index 901faaf131..84b58d9d8d 100644
--- a/examples/simdag/metaxml/metaxml_test.tesh
+++ b/examples/simdag/metaxml/metaxml_test.tesh
@@ -3,20 +3,100 @@
 p Simple test of simdag with metaxml tags
 
 $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host:
+> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_0_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_0_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_1_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_1_host:
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_2_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_1_host:
-> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_0_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_0_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_1_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_1_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_0_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_0_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_1_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_1_host:
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_2_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_0_host:
 > [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_1_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_1_host:
 > [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_2_host:
+> [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_0_host:
+> [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
@@ -24,27 +104,21 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO] Route between lille_1_host and lille_1_host:
 > [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_0_host:
-> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_1_host:
-> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_0_host:
-> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_1_host:
-> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_2_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_2_host:
 > [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_0_host:
+> [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
@@ -52,10 +126,6 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] 	Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO] 	Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] 	Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000