X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c1cac508d7a388a8b109f6c5ab4d6b548a3f521..7049f373e589ff9ffa336720a789f82ef8930aa7:/examples/platforms/dogbone.xml

diff --git a/examples/platforms/dogbone.xml b/examples/platforms/dogbone.xml
index 2e9b2eb363..0b6086fa06 100644
--- a/examples/platforms/dogbone.xml
+++ b/examples/platforms/dogbone.xml
@@ -1,28 +1,74 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="S1" speed="1Gf"/>
-  <host id="C1" speed="1Gf"/>
-  <host id="S2" speed="1Gf"/>
-  <host id="C2" speed="1Gf"/>
-  <router id="R1"/>
-  <router id="R2"/>
 
-  <link id="1" bandwidth="100MBps" latency="10ms"/>
-  <link id="2" bandwidth="100MBps" latency="10ms"/>
-  <link id="3" bandwidth="100MBps" latency="10ms"/>
-  <link id="4" bandwidth="100MBps" latency="10ms"/>
-  <link id="5" bandwidth="100MBps" latency="10ms"/>
+<!-- Describe a dogbone graph, with 4 hosts:
+  --
+  -- S1 ---[ 1 ]---                 ---[ 3 ]--- C1
+  --               \               /
+  --                R1 --[ 2 ]-- R2
+  --               /               \
+  -- S2 ---[ 4 ]---                 ---[ 5 ]--- C2
+  --
+  --
+  -- This platform is a valid NS3 platform, even if it exhibits routes of length >1,
+  -- because when you only keep the routes of length 1,
+  -- you get a graph where every host can speak to any other host.
+  --
+  -- For example, S1--C1 is (l1,l2,l3) of length >1
+  -- But it's also S1--C1 = S1--R1, R1--R2, R2--C1 which are all of length 1
+  --
+  -- http://simgrid.gforge.inria.fr/simgrid/latest/doc/pls_ns3.html
+  -->
 
-  <route src="S1" dst="C1"><link_ctn id="1"/><link_ctn id="2"/><link_ctn id="3"/></route>
-  <route src="S2" dst="C2"><link_ctn id="4"/><link_ctn id="2"/><link_ctn id="5"/></route>
-  <route src="S1" dst="C2"><link_ctn id="1"/><link_ctn id="2"/><link_ctn id="5"/></route>
-  <route src="S2" dst="C1"><link_ctn id="4"/><link_ctn id="2"/><link_ctn id="3"/></route>
-  <route src="S1" dst="R1"><link_ctn id="1"/></route>
-  <route src="R1" dst="R2"><link_ctn id="2"/></route>
-  <route src="R2" dst="C1"><link_ctn id="3"/></route>
-  <route src="S2" dst="R1"><link_ctn id="4"/></route>
-  <route src="R2" dst="C2"><link_ctn id="5"/></route>
-</AS>
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
+    <host id="S1" speed="1Gf"/>
+    <host id="C1" speed="1Gf"/>
+    <host id="S2" speed="1Gf"/>
+    <host id="C2" speed="1Gf"/>
+    <router id="R1"/>
+    <router id="R2"/>
+
+    <link id="1" bandwidth="100MBps" latency="10ms"/>
+    <link id="2" bandwidth="100MBps" latency="10ms"/>
+    <link id="3" bandwidth="100MBps" latency="10ms"/>
+    <link id="4" bandwidth="100MBps" latency="10ms"/>
+    <link id="5" bandwidth="100MBps" latency="10ms"/>
+
+    <route src="S1" dst="C1">
+      <link_ctn id="1"/>
+      <link_ctn id="2"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="S2" dst="C2">
+      <link_ctn id="4"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="S1" dst="C2">
+      <link_ctn id="1"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="S2" dst="C1">
+      <link_ctn id="4"/>
+      <link_ctn id="2"/>
+      <link_ctn id="3"/>
+    </route>
+    <route src="S1" dst="R1">
+      <link_ctn id="1"/>
+    </route>
+    <route src="R1" dst="R2">
+      <link_ctn id="2"/>
+    </route>
+    <route src="R2" dst="C1">
+      <link_ctn id="3"/>
+    </route>
+    <route src="S2" dst="R1">
+      <link_ctn id="4"/>
+    </route>
+    <route src="R2" dst="C2">
+      <link_ctn id="5"/>
+    </route>
+  </zone>
 </platform>