Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / examples / msg / gtnets / dogbone-p.xml

diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index a3ae067..2e9b2eb 100644 (file)
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -1,65 +1,28 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "surfxml.dtd">
-<platform version="2"><!--- 
-  dogbone
--->
-
-
-  <host id="S1" power="1000000000"/>
-  <host id="C1" power="1000000000"/>
-  <host id="S2" power="1000000000"/>
-  <host id="C2" power="1000000000"/>
+<!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="100000000" latency="0.01"/>
-  <link id="2" bandwidth="100000" latency="0.02"/>
-  <link id="3" bandwidth="100000000" latency="0.01"/>
-  <link id="4" bandwidth="100000000" latency="0.01"/>
-  <link id="5" bandwidth="100000000" latency="0.05"/>
-
-
-  <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>
+  <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>
+</AS>
 </platform>