X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c47aee79e005cfe3f1596c8f559ad95ee12fc0..612ee16a751800aa1dd996ee512fa38adcfe001d:/examples/platforms/config_tracing.xml

diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml
index 911638efab..813dfbaf9b 100644
--- a/examples/platforms/config_tracing.xml
+++ b/examples/platforms/config_tracing.xml
@@ -1,17 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
   <config id="example config">
     <prop id="tracing/uncategorized" value="yes"/>
-    <prop id="tracing/buffer" value="yes"/>
     <prop id="tracing" value="yes"/>
-    <prop id="viva/categorized" value="trace-masterworker.cat.plist"/>
     <prop id="tracing/filename" value="trace-masterworker.trace"/>
-    <prop id="viva/uncategorized" value="trace-masterworker.uncat.plist"/>
     <prop id="tracing/categorized" value="yes"/>
   </config>
 
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
     <host id="Tremblay" speed="98.095Mf"/>
     <host id="Jupiter" speed="76.296Mf"/>
     <host id="Fafard" speed="76.296Mf"/>
@@ -32,20 +29,90 @@
     <link id="5" bandwidth="27.94625MBps" latency="278.066us"/>
     <link id="loopback" bandwidth="498MBps" latency="15us" sharing_policy="FATPIPE"/>
 
-    <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-    <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-    <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-    <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-    <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="9"/></route>
-    <route src="Tremblay" dst="Fafard"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Tremblay" dst="Ginette"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Tremblay" dst="Bourassa"><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Jupiter" dst="Fafard"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/></route>
-    <route src="Jupiter" dst="Ginette"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/></route>
-    <route src="Jupiter" dst="Bourassa"><link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Fafard" dst="Ginette"><link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/></route>
-    <route src="Fafard" dst="Bourassa"><link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/></route>
-    <route src="Ginette" dst="Bourassa"><link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/></route>
-  </AS>
+    <route src="Tremblay" dst="Tremblay">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Jupiter" dst="Jupiter">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Fafard" dst="Fafard">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Ginette" dst="Ginette">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Bourassa" dst="Bourassa">
+      <link_ctn id="loopback"/>
+    </route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="9"/>
+    </route>
+    <route src="Tremblay" dst="Fafard">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Tremblay" dst="Ginette">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Tremblay" dst="Bourassa">
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Jupiter" dst="Fafard">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="8"/>
+    </route>
+    <route src="Jupiter" dst="Ginette">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Jupiter" dst="Bourassa">
+      <link_ctn id="9"/>
+      <link_ctn id="4"/>
+      <link_ctn id="3"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Fafard" dst="Ginette">
+      <link_ctn id="8"/>
+      <link_ctn id="1"/>
+      <link_ctn id="0"/>
+      <link_ctn id="2"/>
+      <link_ctn id="5"/>
+    </route>
+    <route src="Fafard" dst="Bourassa">
+      <link_ctn id="8"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+    <route src="Ginette" dst="Bourassa">
+      <link_ctn id="5"/>
+      <link_ctn id="2"/>
+      <link_ctn id="0"/>
+      <link_ctn id="1"/>
+      <link_ctn id="6"/>
+      <link_ctn id="7"/>
+    </route>
+  </zone>
 </platform>