grunt!

diff --git a/examples/java/app/masterworker/masterworker.xml b/examples/java/app/masterworker/masterworker.xml
index d3d4cd86ede7939b553a0f65cd93f3813232474c..bff3dcd18e1fd39d3cfd5b1accfe2e35e13b4731 100644 (file)
--- a/examples/java/app/masterworker/masterworker.xml
+++ b/examples/java/app/masterworker/masterworker.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Jacquelin" function="app.masterworker.Master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Jacquelin" function="app.masterworker.Master">

-     <argument value="5"/>     <!-- Amount of tasks to dispatch -->
-     <argument value="50000"/> <!-- Computation size of each task -->
-     <argument value="10"/>    <!-- Communication size of each one -->
-     <argument value="7"/>     <!-- Amount of workers waiting for orders -->
+    <argument value="5"/>     <!-- Amount of tasks to dispatch -->
+    <argument value="50000"/> <!-- Computation size of each task -->
+    <argument value="10"/>    <!-- Communication size of each one -->
+    <argument value="7"/>     <!-- Amount of workers waiting for orders -->

   </process>
 
   <process host="iRMX" function="app.masterworker.Worker">      <argument value="0"/>  <!-- Input mailbox --> </process>
   </process>
 
   <process host="iRMX" function="app.masterworker.Worker">      <argument value="0"/>  <!-- Input mailbox --> </process>

diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml
index dd3e3c73e6fdf3235e7f4281c859e710ca3bfcdd..348226e547b0bf8c743a96f9a12d481c907669e0 100644 (file)
--- a/examples/java/process/startkilltime/startkilltime.xml
+++ b/examples/java/process/startkilltime/startkilltime.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-    <process host="node-0.acme.org" function="process.startkilltime.Sleeper" start_time="0" kill_time="5">  <argument value="10"/></process>
-    <process host="node-1.acme.org" function="process.startkilltime.Sleeper" start_time="1" kill_time="6">  <argument value="10"/></process>
-    <process host="node-2.acme.org" function="process.startkilltime.Sleeper" start_time="2" kill_time="7">  <argument value="4" /></process>
-    <process host="node-3.acme.org" function="process.startkilltime.Sleeper" start_time="3" kill_time="8">  <argument value="4" /></process>
-    <process host="node-4.acme.org" function="process.startkilltime.Sleeper" start_time="4" kill_time="9">  <argument value="5" /></process>
-    <process host="node-5.acme.org" function="process.startkilltime.Sleeper" start_time="5" kill_time="10"> <argument value="5"/></process>
+  <process host="node-0.acme.org" function="process.startkilltime.Sleeper" start_time="0" kill_time="5">  <argument value="10"/></process>
+  <process host="node-1.acme.org" function="process.startkilltime.Sleeper" start_time="1" kill_time="6">  <argument value="10"/></process>
+  <process host="node-2.acme.org" function="process.startkilltime.Sleeper" start_time="2" kill_time="7">  <argument value="4" /></process>
+  <process host="node-3.acme.org" function="process.startkilltime.Sleeper" start_time="3" kill_time="8">  <argument value="4" /></process>
+  <process host="node-4.acme.org" function="process.startkilltime.Sleeper" start_time="4" kill_time="9">  <argument value="5" /></process>
+  <process host="node-5.acme.org" function="process.startkilltime.Sleeper" start_time="5" kill_time="10"> <argument value="5"/></process>

 </platform>
 </platform>

diff --git a/examples/msg/async-wait/async-wait2_d.xml b/examples/msg/async-wait/async-wait2_d.xml
index fe79729d36dc6eb359b233f5a22cc9d8d137e2eb..6e731068cddfc8bc85071088025b704b98880b65 100644 (file)
--- a/examples/msg/async-wait/async-wait2_d.xml
+++ b/examples/msg/async-wait/async-wait2_d.xml
@@ -3,12 +3,12 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">

-     <argument value="3"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="1"/>         <!-- Number of receivers -->
-     <argument value="1"/>         <!-- Sleep_start_time -->
-     <argument value="0.1"/>      <!-- Time for test -->
+    <argument value="3"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>   <!-- Communication size of tasks -->
+    <argument value="1"/>         <!-- Number of receivers -->
+    <argument value="1"/>         <!-- Sleep_start_time -->
+    <argument value="0.1"/>      <!-- Time for test -->

   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">
   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">

diff --git a/examples/msg/async-wait/async-wait3_d.xml b/examples/msg/async-wait/async-wait3_d.xml
index 651a8f4ebc86726b65b8c3250e9c5b6fa5112ea6..27c1d209fb34dff39f927f3147d685330522ed01 100644 (file)
--- a/examples/msg/async-wait/async-wait3_d.xml
+++ b/examples/msg/async-wait/async-wait3_d.xml
@@ -3,12 +3,12 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">

-     <argument value="3"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="1"/>         <!-- Number of receivers -->
-     <argument value="5"/>         <!-- Sleep_start_time -->
-     <argument value="0"/>      <!-- Time for test -->
+    <argument value="3"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>   <!-- Communication size of tasks -->
+    <argument value="1"/>         <!-- Number of receivers -->
+    <argument value="5"/>         <!-- Sleep_start_time -->
+    <argument value="0"/>      <!-- Time for test -->

   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">
   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">

diff --git a/examples/msg/async-wait/async-wait4_d.xml b/examples/msg/async-wait/async-wait4_d.xml
index 22650e2357648336c1e890afedf4142af2c6bc91..939d62e426f6455e0048d6992387484449fdd4e9 100644 (file)
--- a/examples/msg/async-wait/async-wait4_d.xml
+++ b/examples/msg/async-wait/async-wait4_d.xml
@@ -3,12 +3,12 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">

-     <argument value="3"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="1"/>         <!-- Number of receivers -->
-     <argument value="1"/>         <!-- Sleep_start_time -->
-     <argument value="0"/>      <!-- Time for test -->
+    <argument value="3"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>   <!-- Communication size of tasks -->
+    <argument value="1"/>         <!-- Number of receivers -->
+    <argument value="1"/>         <!-- Sleep_start_time -->
+    <argument value="0"/>      <!-- Time for test -->

   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">
   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">

diff --git a/examples/msg/async-wait/async-wait_d.xml b/examples/msg/async-wait/async-wait_d.xml
index bb55c55fa374f940a6587f393fe1ff39a30c0c1d..f72618e9ce5a8b7623ebc209ee9385d37536a6f4 100644 (file)
--- a/examples/msg/async-wait/async-wait_d.xml
+++ b/examples/msg/async-wait/async-wait_d.xml
@@ -3,12 +3,12 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">

-     <argument value="3"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="1"/>         <!-- Number of receivers -->
-     <argument value="5"/>         <!-- Sleep_start_time -->
-     <argument value="0.1"/>      <!-- Time for test -->
+    <argument value="3"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>   <!-- Communication size of tasks -->
+    <argument value="1"/>         <!-- Number of receivers -->
+    <argument value="5"/>         <!-- Sleep_start_time -->
+    <argument value="0.1"/>      <!-- Time for test -->

   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">
   </process>
   <!-- The receiver processes -->
   <process host="Ruby" function="receiver">

diff --git a/examples/msg/network-ns3/3hosts_2links_d.xml b/examples/msg/network-ns3/3hosts_2links_d.xml
index 661289ad112c0fa72d42acaaea5a31dbf92ca255..a360912ef82f045654649fc7868bb91cda66f54d 100644 (file)
--- a/examples/msg/network-ns3/3hosts_2links_d.xml
+++ b/examples/msg/network-ns3/3hosts_2links_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">

-      <argument value="100"/>
-      <argument value="Jupiter"/>
-      <argument value="1"/>
+    <argument value="100"/>
+    <argument value="Jupiter"/>
+    <argument value="1"/>

   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>
   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>

diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml
index e196248d3b830faa7b8044add562979d5c3d893b..c9727c3a7b1a9b99655c58e61a2806a17d2d053f 100644 (file)
--- a/examples/msg/network-ns3/3links-timer_d.xml
+++ b/examples/msg/network-ns3/3links-timer_d.xml
@@ -2,33 +2,33 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">

-      <argument value="10000"/>
-      <argument value="Jupiter"/>
-      <argument value="1"/>
+    <argument value="10000"/>
+    <argument value="Jupiter"/>
+    <argument value="1"/>

   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">

-      <argument value="10000"/>
-      <argument value="Ginette"/>
-      <argument value="2"/>
+    <argument value="10000"/>
+    <argument value="Ginette"/>
+    <argument value="2"/>

   </process>
   <process host="Ginette" function="worker">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
   </process>
   <process host="Ginette" function="worker">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">

-      <argument value="10000"/>
-      <argument value="Lovelace"/>
-      <argument value="3"/>
+    <argument value="10000"/>
+    <argument value="Lovelace"/>
+    <argument value="3"/>

   </process>
   <process host="Lovelace" function="worker">
     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">
   </process>
   <process host="Lovelace" function="worker">
     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">

-      <argument value="10000"/>
-      <argument value="Lovelace"/>
-      <argument value="4"/>
+    <argument value="10000"/>
+    <argument value="Lovelace"/>
+    <argument value="4"/>

   </process>
   <process host="Lovelace" function="worker">
     <argument value="4"/>
   </process>
   <process host="Lovelace" function="worker">
     <argument value="4"/>

diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml
index 37ea1f8694f46f894036b2fedf146dc52789bcae..9ae01af3ea3f763fc21f2271a3d1062ee7c22b5d 100644 (file)
--- a/examples/msg/network-ns3/3links_d.xml
+++ b/examples/msg/network-ns3/3links_d.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Tremblay" function="master">

-      <argument value="10000"/>
-      <argument value="Jupiter"/>
-      <argument value="1"/>
+    <argument value="10000"/>
+    <argument value="Jupiter"/>
+    <argument value="1"/>

   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
   </process>
   <process host="Jupiter" function="worker">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">

-      <argument value="10000"/>
-      <argument value="Ginette"/>
-      <argument value="2"/>
+    <argument value="10000"/>
+    <argument value="Ginette"/>
+    <argument value="2"/>

   </process>
   <process host="Ginette" function="worker">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
   </process>
   <process host="Ginette" function="worker">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">

-      <argument value="10000"/>
-      <argument value="Lovelace"/>
-      <argument value="3"/>
+    <argument value="10000"/>
+    <argument value="Lovelace"/>
+    <argument value="3"/>

   </process>
   <process host="Lovelace" function="worker">
     <argument value="3"/>
   </process>
   <process host="Lovelace" function="worker">
     <argument value="3"/>

diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml
index 14efa4115c4f6c439cc4e6a001c8d27ac94d4322..91ce4790b827a68c08e4949afb606c5a856b14ad 100644 (file)
--- a/examples/msg/network-ns3/crosstraffic_d.xml
+++ b/examples/msg/network-ns3/crosstraffic_d.xml
@@ -2,33 +2,33 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="1"/>
+    <argument value="10000"/>
+    <argument value="C1"/>
+    <argument value="1"/>

   </process>
   <process host="C1" function="worker">
     <argument value="1"/>
   </process>
   <process host="S1" function="master">
   </process>
   <process host="C1" function="worker">
     <argument value="1"/>
   </process>
   <process host="S1" function="master">

-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="2"/>
+    <argument value="10000"/>
+    <argument value="C1"/>
+    <argument value="2"/>

   </process>
   <process host="C1" function="worker">
     <argument value="2"/>
   </process>
   <process host="S1" function="master">
   </process>
   <process host="C1" function="worker">
     <argument value="2"/>
   </process>
   <process host="S1" function="master">

-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="3"/>
+    <argument value="10000"/>
+    <argument value="C1"/>
+    <argument value="3"/>

   </process>
   <process host="C1" function="worker">
     <argument value="3"/>
   </process>
   <process host="C1" function="master">
   </process>
   <process host="C1" function="worker">
     <argument value="3"/>
   </process>
   <process host="C1" function="master">

-      <argument value="10000"/>
-      <argument value="S1"/>
-      <argument value="4"/>
+    <argument value="10000"/>
+    <argument value="S1"/>
+    <argument value="4"/>

   </process>
   <process host="S1" function="worker">
     <argument value="4"/>
   </process>
   <process host="S1" function="worker">
     <argument value="4"/>

diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml
index 803a4f826164c2d9e7f58badfae36e06dbb0fff7..cf3068b693f5dcd10408dd73e886e5d91c74ff59 100644 (file)
--- a/examples/msg/network-ns3/dogbone_d.xml
+++ b/examples/msg/network-ns3/dogbone_d.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="0"/>
+    <argument value="10000"/>
+    <argument value="C1"/>
+    <argument value="0"/>

   </process>
   <process host="S2" function="master">
   </process>
   <process host="S2" function="master">

-      <argument value="10000"/>
-      <argument value="C2"/>
-      <argument value="1"/>
+    <argument value="10000"/>
+    <argument value="C2"/>
+    <argument value="1"/>

   </process>
   <process host="C1" function="worker">
   </process>
   <process host="C1" function="worker">

-      <argument value="0"/>
+    <argument value="0"/>

   </process>
   <process host="C2" function="worker">
   </process>
   <process host="C2" function="worker">

-      <argument value="1"/>
+    <argument value="1"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml
index 9c3dd43837f88c4605608d3746b9d7d3483e92e7..9eab752e5f108c3924c9caa0202f64e932bafc2f 100644 (file)
--- a/examples/msg/network-ns3/one_cluster_d.xml
+++ b/examples/msg/network-ns3/one_cluster_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="node-2.acme.org" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="node-2.acme.org" function="master">

-      <argument value="100"/>
-      <argument value="node-6.acme.org"/>
-      <argument value="1"/>
+    <argument value="100"/>
+    <argument value="node-6.acme.org"/>
+    <argument value="1"/>

   </process>
   <process host="node-6.acme.org" function="worker">
     <argument value="1"/>
   </process>
   <process host="node-6.acme.org" function="worker">
     <argument value="1"/>

diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml
index eaaafc6d3ede7a822babcb1a018ddfce59473171..4bc51076f55fe908009df4721d0fabf217ff636e 100644 (file)
--- a/examples/msg/network-ns3/onelink_d.xml
+++ b/examples/msg/network-ns3/onelink_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="S1" function="master">

-      <argument value="10000"/>
-      <argument value="C1"/>
-      <argument value="1"/>
+    <argument value="10000"/>
+    <argument value="C1"/>
+    <argument value="1"/>

   </process>
   <process host="C1" function="worker">
     <argument value="1"/>
   </process>
   <process host="C1" function="worker">
     <argument value="1"/>

diff --git a/examples/msg/network-ns3/two_clusters_d.xml b/examples/msg/network-ns3/two_clusters_d.xml
index 99f25838db2680e39980d6351507c2afd3261204..db540cbbf29ef81b44aa190a9c3511af2fc20e06 100644 (file)
--- a/examples/msg/network-ns3/two_clusters_d.xml
+++ b/examples/msg/network-ns3/two_clusters_d.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="node-3.acme.org" function="master">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="node-3.acme.org" function="master">

-      <argument value="100"/>
-      <argument value="node-16.acme.org"/>
-      <argument value="1"/>
+    <argument value="100"/>
+    <argument value="node-16.acme.org"/>
+    <argument value="1"/>

   </process>
   <process host="node-16.acme.org" function="worker">
     <argument value="1"/>
   </process>
   <process host="node-16.acme.org" function="worker">
     <argument value="1"/>

diff --git a/examples/msg/task-priority/task-priority_d.xml b/examples/msg/task-priority/task-priority_d.xml
index dc50e150ee422c23ac5bae64a02dcfe982904d53..3d8f51371b5d4b0e6bdd7aec403d86501dd105f8 100644 (file)
--- a/examples/msg/task-priority/task-priority_d.xml
+++ b/examples/msg/task-priority/task-priority_d.xml
@@ -1,6 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <process host="Fafard" function="test"> <argument value="76296000"/> <argument value="1.0"/> </process>
-  <process host="Fafard" function="test"> <argument value="76296000"/> <argument value="2.0"/> </process>
+  <process host="Fafard" function="test">
+    <argument value="76296000"/>
+    <argument value="1.0"/>
+  </process>
+  <process host="Fafard" function="test">
+    <argument value="76296000"/>
+    <argument value="2.0"/>
+  </process>

 </platform>
 </platform>

diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml
index f53ca934aeeac5c34e770f01bb01373e8767f625..7bca96a90bc4893f561054002b510bc6770b7f62 100644 (file)
--- a/examples/platforms/bypassASroute.xml
+++ b/examples/platforms/bypassASroute.xml
@@ -13,17 +13,17 @@
     <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">
     <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">

-       <link_ctn id="link1"/><link_ctn id="link2"/>
+      <link_ctn id="link1"/><link_ctn id="link2"/>

     </ASroute>
     <ASroute src="my_cluster_1" dst="my_cluster_3" gw_src="my_cluster_1_router" gw_dst="my_cluster_3_router">
     </ASroute>
     <ASroute src="my_cluster_1" dst="my_cluster_3" gw_src="my_cluster_1_router" gw_dst="my_cluster_3_router">

-       <link_ctn id="link1"/><link_ctn id="link3"/>
+      <link_ctn id="link1"/><link_ctn id="link3"/>

     </ASroute>
     <ASroute src="my_cluster_2" dst="my_cluster_3" gw_src="my_cluster_2_router" gw_dst="my_cluster_3_router">
     </ASroute>
     <ASroute src="my_cluster_2" dst="my_cluster_3" gw_src="my_cluster_2_router" gw_dst="my_cluster_3_router">

-       <link_ctn id="link2"/><link_ctn id="link3"/>
+      <link_ctn id="link2"/><link_ctn id="link3"/>

     </ASroute>
 
     <bypassASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">
     </ASroute>
 
     <bypassASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">

-       <link_ctn id="link_tmp"/>
+      <link_ctn id="link_tmp"/>

     </bypassASroute>
   </AS>
 </platform>
     </bypassASroute>
   </AS>
 </platform>

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index f7c271006039a7e5d82902621dcf12054cea1b54..e2cc7a3f27da0a0687ea51284ea506c2558ff274 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -1,336 +1,335 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<config id="General">
-  <prop id="network/coordinates" value="yes"/>
-</config>
+  <config id="General">
+    <prop id="network/coordinates" value="yes"/>
+  </config>

 
 

-<AS id="AS0" routing="Vivaldi">
-  <AS id="AS1_dc1" routing="Full">
-    <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation -->
-    <!-- 3 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-    <!-- clusters -->
-    <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
+  <AS id="AS0" routing="Vivaldi">
+    <AS id="AS1_dc1" routing="Full">
+      <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation -->
+      <!-- 3 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+      <!-- clusters -->
+      <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"

              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>

-    <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"
-           bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-
-    <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
-
-    <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-    <AS id="gw_AS1_dc1" routing="Floyd">
-      <!-- equipments-->
-      <router id="gw_dc1_horizdist"/>
-      <router id="gw_dc1_maindist"/>
-      <router id="gw_dc1_entranceroom"/>
-      <!-- ISP end point, entering the cloud, so it has coordinates -->
-      <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4"/>
-
-      <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>
-      <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
-      <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
-
-      <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
-      <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
-      <route src="gw_dc1_entranceroom" dst="router_AS1_dc1"><link_ctn id="dc1_entranceroom_ISP"/></route>
-    </AS>

 
 

-    <!-- internal routes between clusters -->
-    <ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
-             gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-      <link_ctn id="link_dc1_cb3"/><link_ctn id="link_dc1_cb1"/>
-    </ASroute>
-    <ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
-             gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-      <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb1"/>
-    </ASroute>
-    <ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
-             gw_dst="cb3-AS1_cb3_router.dc1.acloud.com">
-      <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <!-- routes to exit AS -->
-    <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com"
-             gw_dst="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb1"/>
-    </ASroute>
-    <ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
-             gw_dst="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
-             gw_dst="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb2"/>
-    </ASroute> 
-    <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com"
-             gw_src="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb1"/>
-    </ASroute>
-    <ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com"
-             gw_src="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com"
-             gw_src="gw_dc1_horizdist">
-       <link_ctn id="link_dc1_cb2"/>
-    </ASroute>
-  </AS>
+      <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>

 
 

-  <AS id="AS2_dc2" routing="Full">
-    <!--bigger tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : Full -->
-    <!-- 6 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-    <!-- clusters -->
-    <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" speed="5.2297Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" speed="8.8925Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" speed="13.357Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" speed="5.2297Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" speed="8.8925Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" speed="13.357Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+      <AS id="gw_AS1_dc1" routing="Floyd">
+        <!-- equipments-->
+        <router id="gw_dc1_horizdist"/>
+        <router id="gw_dc1_maindist"/>
+        <router id="gw_dc1_entranceroom"/>
+        <!-- ISP end point, entering the cloud, so it has coordinates -->
+        <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4"/>

 
 

-    <link id="link_dc2_cb1" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc2_cb2" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc2_cb3" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc2_cb4" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc2_cb5" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>

 
 

-    <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-    <AS id="gw_AS2_dc2" routing="Floyd">
-      <!-- equipments-->
-      <router id="gw_dc2_horizdist"/>
-      <router id="gw_dc2_maindist"/>
-      <router id="gw_dc2_entranceroom"/>
-      <!-- ISP end point, entering the cloud, so it has coordinates -->
-      <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4"/>
+        <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
+        <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
+        <route src="gw_dc1_entranceroom" dst="router_AS1_dc1"><link_ctn id="dc1_entranceroom_ISP"/></route>
+      </AS>

 
 

-      <!-- links -->
-      <link id="dc2_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>
-      <link id="dc2_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
-      <link id="dc2_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
-      <!-- links to router relationships -->
-      <route src="gw_dc2_horizdist" dst="gw_dc2_maindist"><link_ctn id="dc2_horizdist_maindist"/></route>
-      <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom"><link_ctn id="dc2_maindist_entranceroom"/></route>
-      <route src="gw_dc2_entranceroom" dst="router_AS2_dc2"><link_ctn id="dc2_entranceroom_ISP"/></route>
+      <!-- internal routes between clusters -->
+      <ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
+               gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb3"/><link_ctn id="link_dc1_cb1"/>
+      </ASroute>
+      <ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
+               gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb1"/>
+      </ASroute>
+      <ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
+               gw_dst="cb3-AS1_cb3_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
+      </ASroute>
+      <!-- routes to exit AS -->
+      <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb1"/>
+      </ASroute>
+      <ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
+               gw_dst="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb3"/>
+      </ASroute>
+      <ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
+               gw_dst="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb2"/>
+      </ASroute> 
+      <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com"
+               gw_src="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb1"/>
+      </ASroute>
+      <ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com"
+               gw_src="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb3"/>
+      </ASroute>
+      <ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com"
+               gw_src="gw_dc1_horizdist">
+         <link_ctn id="link_dc1_cb2"/>
+      </ASroute>

     </AS>
 
     </AS>
 

-    <!-- internal routes between clusters -->
-    <ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
-             gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb4"/><link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
-             gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
-             gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
-             gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb2"/> <link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
-             gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
-             gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb5"/>
-    </ASroute>
-    <ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
-             gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" 
-             gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
-             gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb5"/>
-    </ASroute>
-    <ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
-             gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb2"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-      <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-      <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb5"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb2"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="cb3-AS2_cb3_router.dc2.acloud.com">
-       <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb3"/>
-    </ASroute>
+    <AS id="AS2_dc2" routing="Full">
+      <!--bigger tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : Full -->
+      <!-- 6 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+      <!-- clusters -->
+      <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>

 
 

-    <!-- routess to exit AS -->
-    <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb5"/>
-    </ASroute>
-    <ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb2"/>
-    </ASroute>
-    <ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb3"/>
-    </ASroute>
-    <ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_dst="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb1"/>
-    </ASroute> 
-    <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb6"/>
-    </ASroute>
-    <ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb4"/>
-    </ASroute>
-    <ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb5"/>
-    </ASroute>
-    <ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb2"/>
-    </ASroute>
-    <ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb3"/>
-    </ASroute>
-    <ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com"
-             gw_src="gw_dc2_horizdist">
-       <link_ctn id="link_dc2_cb1"/>
-    </ASroute> 
-   </AS>
+      <link id="link_dc2_cb1" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc2_cb2" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc2_cb3" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc2_cb4" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc2_cb5" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>

 
 

-   <AS id="AS3_dc3" routing="Full">  
-     <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : FULL -->    
-     <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-     <!-- clusters -->
-     <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" speed="5.2297Gf"
-              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-     <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" speed="8.8925Gf"
-              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-     <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
-              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-     <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
-              bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-
-     <link id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
-     <link id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
-     <link id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
-     <link id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
-
-     <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-     <AS id="gw_AS3_dc3" routing="Floyd">
+      <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+      <AS id="gw_AS2_dc2" routing="Floyd">

         <!-- equipments-->
         <!-- equipments-->

-        <router id="gw_dc3_horizdist"/>
-        <router id="gw_dc3_maindist"/>
-        <router id="gw_dc3_entranceroom"/>
+        <router id="gw_dc2_horizdist"/>
+        <router id="gw_dc2_maindist"/>
+        <router id="gw_dc2_entranceroom"/>

         <!-- ISP end point, entering the cloud, so it has coordinates -->
         <!-- ISP end point, entering the cloud, so it has coordinates -->

-        <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6"/>
+        <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4"/>

 
         <!-- links -->
 
         <!-- links -->

-        <link id="dc3_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
-        <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
-        <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
+        <link id="dc2_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc2_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc2_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>

         <!-- links to router relationships -->
         <!-- links to router relationships -->

-        <route src="gw_dc3_horizdist" dst="gw_dc3_maindist"><link_ctn id="dc3_horizdist_maindist"/></route>
-        <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
-        <route src="gw_dc3_entranceroom" dst="router_AS3_dc3"><link_ctn id="dc3_entranceroom_ISP"/></route>
+        <route src="gw_dc2_horizdist" dst="gw_dc2_maindist"><link_ctn id="dc2_horizdist_maindist"/></route>
+        <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom"><link_ctn id="dc2_maindist_entranceroom"/></route>
+        <route src="gw_dc2_entranceroom" dst="router_AS2_dc2"><link_ctn id="dc2_entranceroom_ISP"/></route>
+      </AS>
+
+      <!-- internal routes between clusters -->
+      <ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
+               gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb4"/><link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
+               gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
+               gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb5"/><link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
+               gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb2"/> <link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
+               gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
+               gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb2"/><link_ctn id="link_dc2_cb5"/>
+      </ASroute>
+      <ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
+               gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" 
+               gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
+               gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb5"/>
+      </ASroute>
+      <ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
+               gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb3"/><link_ctn id="link_dc2_cb2"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
+        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
+        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb5"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb2"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="cb3-AS2_cb3_router.dc2.acloud.com">
+         <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb3"/>
+      </ASroute>
+
+      <!-- routess to exit AS -->
+      <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb5"/>
+      </ASroute>
+      <ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb2"/>
+      </ASroute>
+      <ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb3"/>
+      </ASroute>
+      <ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_dst="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb1"/>
+      </ASroute> 
+      <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb6"/>
+      </ASroute>
+      <ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb4"/>
+      </ASroute>
+      <ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb5"/>
+      </ASroute>
+      <ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb2"/>
+      </ASroute>
+      <ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb3"/>
+      </ASroute>
+      <ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com"
+               gw_src="gw_dc2_horizdist">
+         <link_ctn id="link_dc2_cb1"/>
+      </ASroute> 

      </AS>
 
      </AS>
 

-     <!-- internal routes between clusters -->
-     <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
-              gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb2"/><link_ctn id="link_dc3_cb3"/>
-     </ASroute>
-     <ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-              gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb3"/>
-     </ASroute>
-     <ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-              gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb2"/>
-     </ASroute>
-     <ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-              gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb3"/>
-     </ASroute>
-     <ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-              gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb2"/>
-     </ASroute>
-     <ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-              gw_dst="cb1-AS3_cb1_router.dc3.acloud.com">
-        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb1"/>
-     </ASroute>
+     <AS id="AS3_dc3" routing="Full">  
+       <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : FULL -->    
+       <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+       <!-- clusters -->
+       <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" speed="5.2297Gf"
+                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+       <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" speed="8.8925Gf"
+                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+       <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
+                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+       <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
+                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+
+       <link id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
+       <link id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
+       <link id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
+       <link id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
+
+       <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+       <AS id="gw_AS3_dc3" routing="Floyd">
+          <!-- equipments-->
+          <router id="gw_dc3_horizdist"/>
+          <router id="gw_dc3_maindist"/>
+          <router id="gw_dc3_entranceroom"/>
+          <!-- ISP end point, entering the cloud, so it has coordinates -->
+          <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6"/>

 
 

-     <!-- routes to exit AS -->
-     <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com"
-              gw_dst="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb3"/>
-     </ASroute>
-     <ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
-              gw_dst="gw_dc3_horizdist">
-       <link_ctn id="link_dc3_cb2"/>
-     </ASroute>
-     <ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-              gw_dst="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb1"/>
-     </ASroute>
-     <ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-              gw_dst="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb4"/>
-     </ASroute>
-     <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com"
-              gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb3"/>
-     </ASroute>
-     <ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com"
-              gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb2"/>
-     </ASroute>
-     <ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com"
-              gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb1"/>
-     </ASroute>
-     <ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com"
-              gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb4"/>
-     </ASroute>  
+          <!-- links -->
+          <link id="dc3_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+          <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+          <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
+          <!-- links to router relationships -->
+          <route src="gw_dc3_horizdist" dst="gw_dc3_maindist"><link_ctn id="dc3_horizdist_maindist"/></route>
+          <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
+          <route src="gw_dc3_entranceroom" dst="router_AS3_dc3"><link_ctn id="dc3_entranceroom_ISP"/></route>
+       </AS>
+
+       <!-- internal routes between clusters -->
+       <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
+                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb2"/><link_ctn id="link_dc3_cb3"/>
+       </ASroute>
+       <ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb3"/>
+       </ASroute>
+       <ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+                gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb2"/>
+       </ASroute>
+       <ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb3"/>
+       </ASroute>
+       <ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+                gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb2"/>
+       </ASroute>
+       <ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+                gw_dst="cb1-AS3_cb1_router.dc3.acloud.com">
+          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb1"/>
+       </ASroute>
+
+       <!-- routes to exit AS -->
+       <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com"
+                gw_dst="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb3"/>
+       </ASroute>
+       <ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
+                gw_dst="gw_dc3_horizdist">
+         <link_ctn id="link_dc3_cb2"/>
+       </ASroute>
+       <ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+                gw_dst="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb1"/>
+       </ASroute>
+       <ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+                gw_dst="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb4"/>
+       </ASroute>
+       <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com"
+                gw_src="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb3"/>
+       </ASroute>
+       <ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com"
+                gw_src="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb2"/>
+       </ASroute>
+       <ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com"
+                gw_src="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb1"/>
+       </ASroute>
+       <ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com"
+                gw_src="gw_dc3_horizdist">
+          <link_ctn id="link_dc3_cb4"/>
+       </ASroute>  
+    </AS>

   </AS>
   </AS>

-</AS>

 </platform>
 </platform>

diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml
index a67462865a8957ad062a76dd8a3430a86a5b0bc2..c306524dfc60cd2faf3f38aa70de654cda062465 100644 (file)
--- a/examples/platforms/cluster.xml
+++ b/examples/platforms/cluster.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<!--             _________
-                |          |
-                |  router  |
-    ____________|__________|_____________ backbone
-      |   |   |              |     |   |  
-    l0| l1| l2|           l97| l96 |   | l99
-      |   |   |   ........   |     |   |
-      |                                |
-  node-0.acme.org                  node-99.acme.org
--->
+  <!--             _________
+                  |          |
+                  |  router  |
+      ____________|__________|_____________ backbone
+        |   |   |              |     |   |  
+      l0| l1| l2|           l97| l96 |   | l99
+        |   |   |   ........   |     |   |
+        |                                |
+    node-0.acme.org                  node-99.acme.org
+  -->

   <cluster id="acme" prefix="node-" suffix=".acme.org" radical="0-99" speed="1Gf" bw="125MBps" lat="50us"
            bb_bw="2.25GBps"  bb_lat="500us"/>
 </platform>
   <cluster id="acme" prefix="node-" suffix=".acme.org" radical="0-99" speed="1Gf" bw="125MBps" lat="50us"
            bb_bw="2.25GBps"  bb_lat="500us"/>
 </platform>

diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml
index 02d11d7354ceb78a4469e6a5bd9ca2ee2b23aa51..fbdad7e8ad7ba7cbfb19c58092cc7ef508a089ea 100644 (file)
--- a/examples/platforms/cluster_and_one_host.xml
+++ b/examples/platforms/cluster_and_one_host.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <AS id="AS0"  routing="Full">   
+  <AS id="AS0" routing="Full">

     <cluster id="my_cluster_1" prefix="c-" suffix=".me" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              router_id="router1"/>
 
     <cluster id="my_cluster_1" prefix="c-" suffix=".me" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              router_id="router1"/>
 


@@ -11,6 +11,8 @@
 
     <link id="link1" bandwidth="100kBps" latency="10ms"/>
 
 
     <link id="link1" bandwidth="100kBps" latency="10ms"/>
 

-    <ASroute src="my_cluster_1" dst="AS1" gw_src="router1" gw_dst="host1"><link_ctn id="link1"/></ASroute>
+    <ASroute src="my_cluster_1" dst="AS1" gw_src="router1" gw_dst="host1">
+      <link_ctn id="link1"/>
+    </ASroute>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/cluster_dragonfly.xml b/examples/platforms/cluster_dragonfly.xml
index b192871ba741f0c0ab49c4cb874f2c88206bdfea..a8d66d0ab1a4e4b0571debc00939f0c2c21d12ca 100644 (file)
--- a/examples/platforms/cluster_dragonfly.xml
+++ b/examples/platforms/cluster_dragonfly.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-119" speed="1Gf" 
-           bw="125MBps" lat="50us" topology="DRAGONFLY" topo_parameters="3,4;4,3;5,1;2" loopback_bw="100MBps" loopback_lat="0" limiter_link="150MBps"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-119" speed="1Gf" 
+             bw="125MBps" lat="50us" topology="DRAGONFLY" topo_parameters="3,4;4,3;5,1;2" 
+             loopback_bw="100MBps" loopback_lat="0" limiter_link="150MBps"/>
+  </AS>

 </platform>
 </platform>

diff --git a/examples/platforms/cluster_fat_tree.xml b/examples/platforms/cluster_fat_tree.xml
index 7ab17e7a1abc0f60f0d4a266e86e8794b436887b..83ff7d9250edd5689c97abf7aa47d900f03f5e25 100644 (file)
--- a/examples/platforms/cluster_fat_tree.xml
+++ b/examples/platforms/cluster_fat_tree.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<!-- This is an example for a fat tree cluster. 
-This is taken from figure 1/ b/ of the paper "D-Mod-K Routing Providing on-Blocking Traffic for Shift Permutations on 
-Real Life Fat Trees" available at webee.technion.ac.il/publication-link/index/id/574
-This defines a two levels fat-tree, with 4 leaf switches connected to 4 nodes each and 2 core switches connected to 
-each leaf switch by two cables -->
+  <!-- This is an example for a fat tree cluster. 
+  This is taken from figure 1/ b/ of the paper "D-Mod-K Routing Providing on-Blocking Traffic for Shift Permutations on 
+  Real Life Fat Trees" available at webee.technion.ac.il/publication-link/index/id/574
+  This defines a two levels fat-tree, with 4 leaf switches connected to 4 nodes each and 2 core switches connected to 
+  each leaf switch by two cables -->

 
 

-<AS id="AS0" routing="Full">
-<cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-15" speed="1Gf" bw="125MBps" lat="50us" 
-         topology="FAT_TREE" topo_parameters="2;4,4;1,2;1,2" loopback_bw="100MBps" loopback_lat="0"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-15" speed="1Gf" bw="125MBps" lat="50us" 
+             topology="FAT_TREE" topo_parameters="2;4,4;1,2;1,2" loopback_bw="100MBps" loopback_lat="0"/>
+  </AS>

 </platform>
 </platform>

diff --git a/examples/platforms/cluster_torus.xml b/examples/platforms/cluster_torus.xml
index a0bec806d45db642764e7ee80b1153713f7e1c49..2f23afbf18282ba89ef38c60d1135cc7db701a2d 100644 (file)
--- a/examples/platforms/cluster_torus.xml
+++ b/examples/platforms/cluster_torus.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-11" speed="1Gf" 
-           bw="125MBps" lat="50us" topology="TORUS" topo_parameters="3,2,2" loopback_bw="100MBps" loopback_lat="0"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="node-" suffix=".acme.org" radical="0-11" speed="1Gf" 
+             bw="125MBps" lat="50us" topology="TORUS" topo_parameters="3,2,2" loopback_bw="100MBps" loopback_lat="0"/>
+  </AS>

 </platform>
 </platform>

diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml
index 3aaca87d978cf20dd60a00d298d0cf22afc5c35d..0f4508919f8bf5b0af3afabfc7187edf151635af 100644 (file)
--- a/examples/platforms/config.xml
+++ b/examples/platforms/config.xml
@@ -18,6 +18,8 @@
     <link id="link2" bandwidth="125MBps" latency="50us"/>
     <link id="link3" bandwidth="125MBps" latency="50us"/>
 
     <link id="link2" bandwidth="125MBps" latency="50us"/>
     <link id="link3" bandwidth="125MBps" latency="50us"/>
 

-    <route src="bob" dst="alice"><link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link3"/></route>
+    <route src="bob" dst="alice">
+      <link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link3"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml
index cb115373168f80506d2c45deef557339087e5b68..5f29e6ef8921d4ce925febfa525cd01c9f487cd5 100644 (file)
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -1,58 +1,58 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<config id="General">
-  <prop id="network/coordinates" value="yes"/>
-</config>
-<AS id="AS0" routing="Vivaldi">
-  <AS id="dataCenter1" routing="Full">
-    <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-    <!-- cabinets -->
-    <cluster id="cabinet1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="cabinet2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="cabinet3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+  <config id="General">
+    <prop id="network/coordinates" value="yes"/>
+  </config>
+  <AS id="AS0" routing="Vivaldi">
+    <AS id="dataCenter1" routing="Full">
+      <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+      <!-- cabinets -->
+      <cluster id="cabinet1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="cabinet2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="cabinet3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>

 
 

-    <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
- 
-    <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-    <AS id="gw_dataCenter1" routing="Floyd">
-        <!-- equipments-->
-        <router id="gw_dc1_horizdist"/>
-        <router id="gw_dc1_maindist"/>
-        <router id="gw_dc1_entranceroom"/>
+      <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>

 
 

-        <!-- ISP end point, entering the cloud, so it has coordinates -->
-        <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>
+      <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+      <AS id="gw_dataCenter1" routing="Floyd">
+          <!-- equipments-->
+          <router id="gw_dc1_horizdist"/>
+          <router id="gw_dc1_maindist"/>
+          <router id="gw_dc1_entranceroom"/>

 
 

-        <!-- links -->
-        <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
-        <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
-        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
+          <!-- ISP end point, entering the cloud, so it has coordinates -->
+          <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>

 
 

-        <!-- links to router relationships -->
-        <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
-        <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
-        <route src="gw_dc1_entranceroom" dst="router_dataCenter1"><link_ctn id="dc1_entranceroom_ISP"/></route>
-    </AS>
+          <!-- links -->
+          <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+          <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+          <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
+
+          <!-- links to router relationships -->
+          <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
+          <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
+          <route src="gw_dc1_entranceroom" dst="router_dataCenter1"><link_ctn id="dc1_entranceroom_ISP"/></route>
+      </AS>

 
 

-    <!-- internal routes between cabinets -->
-    <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
-             gw_dst="cb3-cabinet3_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
-             gw_dst="cb3-cabinet3_router.dc1.acloud.com">
-      <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
-             gw_dst="cb2-cabinet2_router.dc1.acloud.com">
-      <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb2"/>
-    </ASroute>
-  </AS>
+      <!-- internal routes between cabinets -->
+      <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
+               gw_dst="cb3-cabinet3_router.dc1.acloud.com">
+          <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
+      </ASroute>
+      <ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+               gw_dst="cb3-cabinet3_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb3"/>
+      </ASroute>
+      <ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+               gw_dst="cb2-cabinet2_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb2"/>
+      </ASroute>
+    </AS>

 </AS>
 </platform>
 </AS>
 </platform>

diff --git a/examples/platforms/dogbone.xml b/examples/platforms/dogbone.xml
index 2e9b2eb363818be88e6c0abe48beaf226330a198..a09b39f8c8d948592c661fe5a06c533509b5c186 100644 (file)
--- a/examples/platforms/dogbone.xml
+++ b/examples/platforms/dogbone.xml
@@ -1,28 +1,28 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?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"/>
+  <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"/>
+    <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>
+    <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>
 </platform>

diff --git a/examples/platforms/small_platform_fatpipe.xml b/examples/platforms/small_platform_fatpipe.xml
index c810aa9d8f851b73cb7626afb6ac443b24e22daf..0ff24b4876b5b1f5b632672be4507d83e13f58d4 100644 (file)
--- a/examples/platforms/small_platform_fatpipe.xml
+++ b/examples/platforms/small_platform_fatpipe.xml
@@ -12,9 +12,17 @@
     <link id="3" bandwidth="498MBps" latency="150us" sharing_policy="FATPIPE"/>
     <link id="4" bandwidth="498MBps" latency="150us" sharing_policy="FATPIPE"/>
 
     <link id="3" bandwidth="498MBps" latency="150us" sharing_policy="FATPIPE"/>
     <link id="4" bandwidth="498MBps" latency="150us" sharing_policy="FATPIPE"/>
 

-    <route src="Tremblay" dst="Ruby"><link_ctn id="1"/></route>
-    <route src="Tremblay" dst="Perl"><link_ctn id="2"/></route>
-    <route src="Tremblay" dst="Java"><link_ctn id="3"/></route>
-    <route src="Ruby" dst="Perl"><link_ctn id="4"/></route>
+    <route src="Tremblay" dst="Ruby">
+      <link_ctn id="1"/>
+    </route>
+    <route src="Tremblay" dst="Perl">
+      <link_ctn id="2"/>
+    </route>
+    <route src="Tremblay" dst="Java">
+      <link_ctn id="3"/>
+    </route>
+    <route src="Ruby" dst="Perl"><
+      link_ctn id="4"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml
index e3acf90a5102055092253e062904345175cb7c89..3caa9db0e709eba346888697702eb6a15e0f6673 100644 (file)
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config><prop id="path" value="../examples/platforms/"/></config>
+  <config>
+    <prop id="path" value="../examples/platforms/"/>
+  </config>

 
   <AS id="AS0" routing="Full">
     <storage_type id="SATA-II_HDD" size="500GB" model="linear_no_lat"
 
   <AS id="AS0" routing="Full">
     <storage_type id="SATA-II_HDD" size="500GB" model="linear_no_lat"


@@ -36,11 +38,23 @@
     <link id="link5" bandwidth="125MBps" latency="50us"/>
     <link id="link6" bandwidth="125MBps" latency="50us"/>
 
     <link id="link5" bandwidth="125MBps" latency="50us"/>
     <link id="link6" bandwidth="125MBps" latency="50us"/>
 

-    <route src="alice" dst="bob"><link_ctn id="link1"/></route>
-    <route src="alice" dst="carl"><link_ctn id="link2"/></route>
-    <route src="alice" dst="dave"><link_ctn id="link3"/></route>
-    <route src="bob" dst="carl"><link_ctn id="link4"/></route>
-    <route src="bob" dst="dave"><link_ctn id="link5"/></route>
-    <route src="carl" dst="dave"><link_ctn id="link6"/></route>
+    <route src="alice" dst="bob">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="alice" dst="carl">
+      <link_ctn id="link2"/>
+    </route>
+    <route src="alice" dst="dave">
+      <link_ctn id="link3"/>
+    </route>
+    <route src="bob" dst="carl">
+      <link_ctn id="link4"/>
+    </route>
+    <route src="bob" dst="dave">
+      <link_ctn id="link5"/>
+    </route>
+    <route src="carl" dst="dave">
+      <link_ctn id="link6"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml
index 84130500d3f78047364bc07f3cf8db372307dcdc..6372351c88947f8ed6e0995b6ee39ab5c934779b 100644 (file)
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -1,21 +1,23 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config><prop id="path" value="../examples/platforms/"/></config>
+  <config>
+    <prop id="path" value="../examples/platforms/"/>
+  </config>

 
   <AS id="AS0" routing="Full">
     <storage_type id="single_HDD" size="500GiB" model="linear_no_lat" 
                   content="content/storage_content.txt" content_type="txt_unix">
 
   <AS id="AS0" routing="Full">
     <storage_type id="single_HDD" size="500GiB" model="linear_no_lat" 
                   content="content/storage_content.txt" content_type="txt_unix">

-       <model_prop id="Bwrite" value="30MBps" />
-       <model_prop id="Bread" value="100MBps" />
-       <model_prop id="Bconnection" value="120MBps" />
+      <model_prop id="Bwrite" value="30MBps" />
+      <model_prop id="Bread" value="100MBps" />
+      <model_prop id="Bconnection" value="120MBps" />

     </storage_type>
 
     <storage_type id="single_SSD" size="500GiB" model="linear_no_lat"
                   content="content/storage_content.txt" content_type="txt_unix">
     </storage_type>
 
     <storage_type id="single_SSD" size="500GiB" model="linear_no_lat"
                   content="content/storage_content.txt" content_type="txt_unix">

-       <model_prop id="Bwrite" value="60MBps" />
-       <model_prop id="Bread" value="200MBps" />
-       <model_prop id="Bconnection" value="220MBps" />
+      <model_prop id="Bwrite" value="60MBps" />
+      <model_prop id="Bread" value="200MBps" />
+      <model_prop id="Bconnection" value="220MBps" />

     </storage_type>
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />
     </storage_type>
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />


@@ -35,12 +37,14 @@
       <mount storageId="Disk3" name="/home"/>
     </host>
     <host id="denise" speed="1Gf">
       <mount storageId="Disk3" name="/home"/>
     </host>
     <host id="denise" speed="1Gf">

-      <mount storageId="Disk2" name="c:"/>     
-      <mount storageId="Disk4" name="/home"/>  
+      <mount storageId="Disk2" name="c:"/>
+      <mount storageId="Disk4" name="/home"/>

     </host>
 
     <link id="link1" bandwidth="125MBps" latency="150us" />
 
     </host>
 
     <link id="link1" bandwidth="125MBps" latency="150us" />
 

-    <route src="bob" dst="alice"><link_ctn id="link1" /></route>
+    <route src="bob" dst="alice">
+      <link_ctn id="link1" />
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/three_multicore_hosts.xml b/examples/platforms/three_multicore_hosts.xml
index adbed975d850919528e3ec1c7195fd89628c73a6..cbc9f00ab125f05d78701639228b1a2f0c25eeca 100644 (file)
--- a/examples/platforms/three_multicore_hosts.xml
+++ b/examples/platforms/three_multicore_hosts.xml
@@ -8,8 +8,14 @@
 
     <link id="link1" bandwidth="125MBps" latency="100us" />
 
 
     <link id="link1" bandwidth="125MBps" latency="100us" />
 

-    <route src="PM0" dst="PM1"><link_ctn id="link1"/></route>
-    <route src="PM0" dst="PM2"><link_ctn id="link1"/></route>
-    <route src="PM1" dst="PM2"><link_ctn id="link1"/></route>
+    <route src="PM0" dst="PM1">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="PM0" dst="PM2">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="PM1" dst="PM2">
+      <link_ctn id="link1"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml
index 6a9dd8a9aa6dae28e391f69794567e4685cbf30f..35b2f2edc2eb1ccaae3381febe8dda2f930efd42 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability_included.xml
+++ b/examples/platforms/two_hosts_platform_with_availability_included.xml
@@ -1,29 +1,29 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<trace id="A" periodicity="1.0">
-0.0 1.0
-11.0 0.5
-20.0 0.9
-</trace>
-<trace id="A_failure" periodicity="10.0">
-1.0 -1.0
-2.0 1.0
-</trace>
-<trace id="B" periodicity="10.0">
-0.0 1.0
-10.0 0.8
-20.0 0.4
-</trace>
+  <trace id="A" periodicity="1.0">
+    0.0 1.0
+    11.0 0.5
+    20.0 0.9
+  </trace>
+  <trace id="A_failure" periodicity="10.0">
+    1.0 -1.0
+    2.0 1.0
+  </trace>
+  <trace id="B" periodicity="10.0">
+    0.0 1.0
+    10.0 0.8
+    20.0 0.4
+  </trace>

 
 

-<AS id="AS0" routing="Full">
-  <host id="Cpu A" speed="10f"/>
-  <host id="Cpu B" speed="10f"/>
-  <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
-  <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
-</AS>
+  <AS id="AS0" routing="Full">
+    <host id="Cpu A" speed="10f"/>
+    <host id="Cpu B" speed="10f"/>
+    <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
+    <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
+  </AS>

 
 

-<trace_connect kind="SPEED" trace="A" element="Cpu A"/>
-<trace_connect kind="HOST_AVAIL" trace="A_failure" element="Cpu A"/>
-<trace_connect kind="SPEED" trace="B" element="Cpu B"/>
+  <trace_connect kind="SPEED" trace="A" element="Cpu A"/>
+  <trace_connect kind="HOST_AVAIL" trace="A_failure" element="Cpu A"/>
+  <trace_connect kind="SPEED" trace="B" element="Cpu B"/>

 </platform>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
index 2f4692a0127e010ec608328e9e051f7033f5f81d..68c4ccc583fe3e4727f3ad7818cec2673adeb448 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="0">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="0">

-       <argument value="40"/>
-       <argument value="1.0"/>
+    <argument value="40"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
index f5f4a76ec30bdd32539eada3afa87a10c0db6f54..d12fc7b5988408d9813f720e82dad82efbc27f8b 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="0">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="0">

-       <argument value="220"/>
-       <argument value="1.0"/>
+    <argument value="220"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
index b02d52dd940aa79807b24813843924a46a131753..6ae2f4ed7400dfbcae826a2bd04473900f59080d 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="40"/>
-       <argument value="1.0"/>
+    <argument value="40"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
index a648155282854fbd78c3ea1936d87eadfaa0c53f..4c9a178f853bf788a53d5ec6c358d9110f1c48b0 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="260"/>
-       <argument value="1.0"/>
+    <argument value="260"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
index 6ce00b53524016d9684f989f140950ff5f43bd1c..33087be338c873b62d544e3f65619352b8e4caa3 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="20">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="20">

-       <argument value="40"/>
-       <argument value="1.0"/>
+    <argument value="40"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
index e045ffa84708146c84811e11827baaf97f695b9b..028b9a1dd6c476aeca685433d265df5d46d135d0 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="20">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="20">

-       <argument value="140"/>
-       <argument value="1.0"/>
+    <argument value="140"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
index 4c2b0f2890f7c8157a56cfec73ccf86eaef83071..8beb1c23f3636e7c5768637b0f387e1457319358 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="40">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="40">

-       <argument value="40"/>
-       <argument value="1.0"/>
+    <argument value="40"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
index 9b629187dbbb220cb2f6f396d35f7ade8b05daf2..c412fe1028268c66c7fe7bade9f8742cd100f8a9 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="40">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="40">

-       <argument value="260"/>
-       <argument value="1.0"/>
+    <argument value="260"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
index 9254e10c5b014d43174989ef9d51bf421caaf5f6..b4a9f57a4135a96e0ca774021108031f707df206 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace">

-       <argument value="170"/>
-       <argument value="1.0"/>
+    <argument value="170"/>
+    <argument value="1.0"/>

   </process>
   <process host="Cpu B" function="test_trace">
   </process>
   <process host="Cpu B" function="test_trace">

-       <argument value="170"/>
-       <argument value="1.0"/>
+    <argument value="170"/>
+    <argument value="1.0"/>

   </process>
   <process host="Cpu B" function="test_trace" start_time="30">
   </process>
   <process host="Cpu B" function="test_trace" start_time="30">

-       <argument value="100"/>
-       <argument value="1.0"/>
+    <argument value="100"/>
+    <argument value="1.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
index e359c4121d144662837e38bdbf41c9ec22c21133..504497c2864af95f5a73fb5a18c2ef0f762e948f 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="25"/>
-       <argument value="1.0"/>
+    <argument value="25"/>
+    <argument value="1.0"/>

   </process>
   <process host="Cpu B" function="test_trace" start_time="10">
   </process>
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="75"/>
-       <argument value="3.0"/>
+    <argument value="75"/>
+    <argument value="3.0"/>

   </process>
   <process host="Cpu B" function="test_trace" start_time="20">
   </process>
   <process host="Cpu B" function="test_trace" start_time="20">

-       <argument value="120"/>
-       <argument value="4.0"/>
+    <argument value="120"/>
+    <argument value="4.0"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
index df5a68a9dc58562d35770089ca793ba6225050a0..aaa2f6cf534de7c146b2da6ba17659a70655f734 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="150"/>
-       <argument value="1.5"/>
+    <argument value="150"/>
+    <argument value="1.5"/>

   </process>
   <process host="Cpu B" function="test_trace" start_time="20">
   </process>
   <process host="Cpu B" function="test_trace" start_time="20">

-       <argument value="70"/>
-       <argument value="1.5"/>
+    <argument value="70"/>
+    <argument value="1.5"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
index 89fffccc77bd3898f3b2dea5eb6920a4453b1c14..163924b2dba9a8267d025004abf406d384602051 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
+++ b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="50"/>
-       <argument value="2.5"/>
+    <argument value="50"/>
+    <argument value="2.5"/>

   </process>
   <process host="Cpu B" function="test_trace" start_time="10">
   </process>
   <process host="Cpu B" function="test_trace" start_time="10">

-       <argument value="70"/>
-       <argument value="1.5"/>
+    <argument value="70"/>
+    <argument value="1.5"/>

   </process>
 </platform>
   </process>
 </platform>

diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml
index 9504826ec8e3bcdc3f705980a5a1ecfba5fb19c0..3637af969506dfd747ae42c2ec4d6deddcaedd7f 100644 (file)
--- a/teshsuite/simdag/platforms/Dijkstra.xml
+++ b/teshsuite/simdag/platforms/Dijkstra.xml
@@ -1,26 +1,34 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

- <AS id="AS0" routing="Dijkstra">
-   <host id="NODO01" speed="10Mf"/>
-   <host id="NODO02" speed="10Mf"/>
+  <AS id="AS0" routing="Dijkstra">
+    <host id="NODO01" speed="10Mf"/>
+    <host id="NODO02" speed="10Mf"/>

 
 

-   <router id="ROUTER"/>
+    <router id="ROUTER"/>

 
 

-   <link id="1" bandwidth="1MBps" latency="1ms"/>
-   <link id="2" bandwidth="1MBps" latency="1ms"/>
-   <link id="10" bandwidth="1MBps" latency="1ms"/>
-   <link id="11" bandwidth="1MBps" latency="1ms"/>
-   <link id="12" bandwidth="1MBps" latency="1ms"/>
+    <link id="1" bandwidth="1MBps" latency="1ms"/>
+    <link id="2" bandwidth="1MBps" latency="1ms"/>
+    <link id="10" bandwidth="1MBps" latency="1ms"/>
+    <link id="11" bandwidth="1MBps" latency="1ms"/>
+    <link id="12" bandwidth="1MBps" latency="1ms"/>

 
 

-   <route src="NODO01" dst="ROUTER" symmetrical="NO"><link_ctn id="1"/></route>
-   <route src="NODO02" dst="ROUTER" symmetrical="NO"><link_ctn id="2"/></route>
+    <route src="NODO01" dst="ROUTER" symmetrical="NO">
+      <link_ctn id="1"/>
+    </route>
+    <route src="NODO02" dst="ROUTER" symmetrical="NO">
+      <link_ctn id="2"/>
+    </route>

 
 

-   <route src="ROUTER" dst="NODO01" symmetrical="NO"><link_ctn id="1"/></route>
-   <route src="ROUTER" dst="NODO02" symmetrical="NO"><link_ctn id="2"/></route>
+    <route src="ROUTER" dst="NODO01" symmetrical="NO">
+      <link_ctn id="1"/>
+    </route>
+    <route src="ROUTER" dst="NODO02" symmetrical="NO">
+      <link_ctn id="2"/>
+    </route>

 
 

-   <route src="NODO01" dst="NODO02" symmetrical="NO">
-     <link_ctn id="10"/><link_ctn id="11"/><link_ctn id="12"/>
-   </route>
- </AS>
+    <route src="NODO01" dst="NODO02" symmetrical="NO">
+      <link_ctn id="10"/><link_ctn id="11"/><link_ctn id="12"/>
+    </route>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
index 60c146862fad52cdc03decca5ae8fb27c54eed13..d038fc1a4f50de22d926777a983800fbc288908a 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@ -1,8 +1,8 @@
-<!-- THIS FILE IS INVALID.
-     It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->

 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

+  <!-- THIS FILE IS INVALID.
+       It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->

   <AS id="AS0" routing="Full">
     <storage_type id="single_HDD" model="SSD" size="4kB">
       <model_prop id="Bwrite" value="30MBps" />
   <AS id="AS0" routing="Full">
     <storage_type id="single_HDD" model="SSD" size="4kB">
       <model_prop id="Bwrite" value="30MBps" />

diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
index e237a2dc8b59b05fcfe5dd5e6e81e8b56188e01b..d297f04c3faf0f7d8aa6588d0b851436c0274fc3 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
@@ -3,16 +3,16 @@
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">

-       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>
+      <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
     <AS id="fr" routing="Full">
     </AS>
     <AS id="fr" routing="Full">

-       <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>
+      <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="us" gw_src="node-cluster_router.cluster.us" dst="fr" gw_dst="neud-grappe_router.grappe.fr">
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="us" gw_src="node-cluster_router.cluster.us" dst="fr" gw_dst="neud-grappe_router.grappe.fr">

-        <link_ctn id="backbone"/>
+      <link_ctn id="backbone"/>

     </ASroute>
   </AS>
 </platform>
     </ASroute>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
index 00d76f9a2688768b55b02782238ca0dea4d17276..b935300e5e22eb0d20f7471a2cc36d77ca6a085f 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
@@ -3,16 +3,16 @@
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">

-       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>
+      <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
     <AS id="fr" routing="Full">
     </AS>
     <AS id="fr" routing="Full">

-        <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>
+      <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="us" gw_src="nod-cluster_router.cluster.us" dst="fr" gw_dst="noeud-grappe_router.grappe.fr">
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="us" gw_src="nod-cluster_router.cluster.us" dst="fr" gw_dst="noeud-grappe_router.grappe.fr">

-        <link_ctn id="backbone"/>
+      <link_ctn id="backbone"/>

     </ASroute>
   </AS>
 </platform>
     </ASroute>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
index 2c88726dc5fa5bf50521c627997ff553d6ad216a..ec5230632ab559c1a33e425bdb88605fb409f09a 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
@@ -1,17 +1,21 @@
-<!-- THIS FILE IS INVALID.
-     It declares a route alice->bob and another bob->alice, both being different.
-     It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->

 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

+  <!-- THIS FILE IS INVALID.
+       It declares a route alice->bob and another bob->alice, both being different.
+       It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->

   <AS  id="AS0"  routing="Full">
     <host id="bob" speed="1Gf"/>
     <host id="alice" speed="500Mf"/>
 
   <AS  id="AS0"  routing="Full">
     <host id="bob" speed="1Gf"/>
     <host id="alice" speed="500Mf"/>
 

-   <link id="link1" bandwidth="125MBps" latency="50us"/>
-   <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>

 
 

-   <route src="bob" dst="alice"><link_ctn id="link1"/></route>
-   <route src="alice" dst="bob"><link_ctn id="link2"/></route>
+    <route src="bob" dst="alice">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="alice" dst="bob">
+      <link_ctn id="link2"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/simdag/platforms/link_attributes.xml
index ee944055c8c8644c099a6dac41a5014818dd236f..62bc33dcc8fe1fdf52ee4bb69e266d79117e4cfc 100644 (file)
--- a/teshsuite/simdag/platforms/link_attributes.xml
+++ b/teshsuite/simdag/platforms/link_attributes.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?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="bob" speed="500Mf"/>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf"/>

 
 

-  <link id="link1" bandwidth="125MBps" latency="50us"/>
-  <link id="link2" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
-  <link id="link3" bandwidth="80MBps" latency="100us" bandwidth_file="link.bw" latency_file="link.lat"/>
-  <link id="link4" bandwidth="80MBps" latency="100us" state_file="link.fail"/>
-</AS>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
+    <link id="link3" bandwidth="80MBps" latency="100us" bandwidth_file="link.bw" latency_file="link.lat"/>
+    <link id="link4" bandwidth="80MBps" latency="100us" state_file="link.fail"/>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml
index 49a4694c0b985820f677830dc0941753b35c63b5..29c7984a7b3003e237952949da473efbd9a70708 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster.xml
+++ b/teshsuite/simdag/platforms/one_cluster.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-           bb_bw="2.25GBps" bb_lat="500us"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
index 543f7f7fdfb22e598711b1684ccb42d54c74be00..d998894386bdf93ffdc7f1ddfcdba15e5ba80538 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
+++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us" sharing_policy="FULLDUPLEX"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" sharing_policy="FULLDUPLEX"/>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/simdag/platforms/one_cluster_multicore.xml
index 589aa15f40c9c1dd5b94423c6be5f826b41ff77e..18de9474b303c5125988d75292df3f3ce5ceb91f 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster_multicore.xml
+++ b/teshsuite/simdag/platforms/one_cluster_multicore.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" core="6" 
-           bw="125MBps" lat="50us"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" core="6" bw="125MBps" lat="50us"/>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml
index 5111016b42bcacb13cd6376b210e89efc40720cf..3682739d332c5bf1d2692f0e827e2235bf5f936d 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster_router_id.xml
+++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-<AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-           bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
-</AS>
+  <AS id="AS0" routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+  </AS>

 </platform>
 </platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1bb.xml b/teshsuite/simdag/platforms/platform_2p_1bb.xml
index ef7632ae1ab69f2e1a94c3345e4357dc8c823ea7..d996cbcc8419ba232be425df1986d0bcb4c5b342 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1bb.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1bb.xml
@@ -10,6 +10,8 @@
 
     <link id="link0" bandwidth="2Bps" latency="2.777777777777777777777777778h" sharing_policy="SHARED"/>
 
 
     <link id="link0" bandwidth="2Bps" latency="2.777777777777777777777777778h" sharing_policy="SHARED"/>
 

-    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml
index 84bf34da267a3a9f739e9e8264ff1b070a99768c..12d217454ef322b7af2a2ebf058ee927dca3f564 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1fl.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1fl.xml
@@ -7,6 +7,8 @@
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="FATPIPE"/>
 
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="FATPIPE"/>
 

-    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml
index 53e2f8aae24adc50363d642c1aa6fe2892036e0e..ed3396e407b245288ad2036ba4523e42e9e18206 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1sl.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1sl.xml
@@ -7,6 +7,8 @@
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
 
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
 

-    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
index 55805e5b32898e00e86a40387dc398fa55840062..c0d1e783400bd6eeb9f2224de7a5e1f21f190853 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
@@ -7,6 +7,8 @@
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED" />
 
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED" />
 

-     <route src="cpu0" dst="cpu1"><link_ctn id="link0" /></route>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0" />
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml
index bd1e546d715bed745ee866bb9ee9717f5bdac6af..34286fc98d27b077fb1d19420b2edebe5993a98e 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1switch.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1switch.xml
@@ -9,6 +9,10 @@
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
     <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
 
     <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
     <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
 

-    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link1"/></route>
- </AS>
- </platform>
+    <route src="cpu0" dst="cpu1">
+      <link_ctn id="link0"/>
+      <link_ctn id="switch"/>
+      <link_ctn id="link1"/>
+    </route>
+  </AS>
+</platform>

diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml
index 1c172ee26554a90b085233861300fa1bbb63c1c3..d73a133809a2ecb9617aaa2a7578bc35f5e92e7e 100644 (file)
--- a/teshsuite/simdag/platforms/platform_include.xml
+++ b/teshsuite/simdag/platforms/platform_include.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="main" routing="Full">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="main" routing="Full">

-    <include file="clusterA.xml"></include>
-    <include file="clusterB.xml"></include>
+    <include file="clusterA.xml"/>
+    <include file="clusterB.xml"/>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml
index a15bf7a113157f4b8843cb53a66cc133a12b0570..28dfd08334987d1c6f2d3502460ebb0ecc71907d 100644 (file)
--- a/teshsuite/simdag/platforms/properties.xml
+++ b/teshsuite/simdag/platforms/properties.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <config id="General">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <config id="General">

-    <prop id="maxmin/precision" value="0.000010"></prop>
-    <prop id="cpu/optim" value="TI"></prop>
-    <prop id="host/model" value="compound"></prop>
-    <prop id="network/model" value="Vegas"></prop>
-    <prop id="path" value="~/"></prop>
+    <prop id="maxmin/precision" value="0.000010"/>
+    <prop id="cpu/optim" value="TI"/>
+    <prop id="host/model" value="compound"/>
+    <prop id="network/model" value="Vegas"/>
+    <prop id="path" value="~/"/>

   </config>
   <AS  id="AS0"  routing="Full">
   </config>
   <AS  id="AS0"  routing="Full">

-     <host id="bob" speed="500Mf"/>
+    <host id="bob" speed="500Mf"/>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml
index 3f5d239c2ad65136fd44294cb7fb09d996af2798..70d10ce573e7e0bc4802e3c90a3d616021ffd8e4 100644 (file)
--- a/teshsuite/simdag/platforms/test_of_is_router.xml
+++ b/teshsuite/simdag/platforms/test_of_is_router.xml
@@ -3,29 +3,29 @@
 <platform version="4">
   <AS  id="AS"  routing="Full">
     <AS  id="AS0"  routing="Full">
 <platform version="4">
   <AS  id="AS"  routing="Full">
     <AS  id="AS0"  routing="Full">

-       <host id="host01" speed="1Gf"/>
-       <host id="host02" speed="500Mf"/>
-       <router id="router1"/>
+      <host id="host01" speed="1Gf"/>
+      <host id="host02" speed="500Mf"/>
+      <router id="router1"/>

     </AS>
     <AS  id="AS1"  routing="Floyd">
     </AS>
     <AS  id="AS1"  routing="Floyd">

-       <host id="host03" speed="1Gf"/>
-       <host id="host04" speed="500Mf"/>
-       <router id="router2"/>
+      <host id="host03" speed="1Gf"/>
+      <host id="host04" speed="500Mf"/>
+      <router id="router2"/>

     </AS>
     <AS  id="AS2"  routing="Dijkstra">
     </AS>
     <AS  id="AS2"  routing="Dijkstra">

-       <host id="host05" speed="1Gf"/>
-       <host id="host06" speed="500Mf"/>
-       <router id="router3"/>
+      <host id="host05" speed="1Gf"/>
+      <host id="host06" speed="500Mf"/>
+      <router id="router3"/>
+    </AS>
+    <AS  id="AS3"  routing="DijkstraCache">
+      <host id="host07" speed="1Gf"/>
+      <host id="host08" speed="500Mf"/>
+      <router id="router4"/>
+    </AS>
+    <AS  id="AS4"  routing="None">
+      <host id="host09" speed="1Gf"/>
+      <host id="host10" speed="500Mf"/>
+      <router id="router5"/>

     </AS>
     </AS>

-   <AS  id="AS3"  routing="DijkstraCache">
-       <host id="host07" speed="1Gf"/>
-       <host id="host08" speed="500Mf"/>
-       <router id="router4"/>
-   </AS>
-   <AS  id="AS4"  routing="None">
-       <host id="host09" speed="1Gf"/>
-       <host id="host10" speed="500Mf"/>
-       <router id="router5"/>
-   </AS>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
index e4e0706fd818928ead0f5587544f573382206e10..b37590cff35e5a17e249d34f80bc08aa830f16bc 100644 (file)
--- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
+++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
@@ -10,9 +10,18 @@
     <link id="link2" bandwidth="125MBps" latency="50us"/>
     <link id="link3" bandwidth="125MBps" latency="50us"/>
 
     <link id="link2" bandwidth="125MBps" latency="50us"/>
     <link id="link3" bandwidth="125MBps" latency="50us"/>
 

-   <route src="bob" dst="alice" symmetrical="NO"><link_ctn id="link1"/></route>
-   <route src="alice" dst="bob" symmetrical="NO"><link_ctn id="link2"/><link_ctn id="link3"/></route>
-   <route src="bob" dst="trudy"><link_ctn id="link2"/></route>
-   <route src="trudy" dst="alice"><link_ctn id="link3"/></route>
+    <route src="bob" dst="alice" symmetrical="NO">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="alice" dst="bob" symmetrical="NO">
+      <link_ctn id="link2"/>
+      <link_ctn id="link3"/>
+    </route>
+    <route src="bob" dst="trudy">
+      <link_ctn id="link2"/>
+    </route>
+    <route src="trudy" dst="alice">
+      <link_ctn id="link3"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index 5fa2b2b325f2f769d6b5bc5b226d72c3ac7288e3..d8b7464dcf5bb27d75af6016683414877f13afca 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -7,11 +7,11 @@
     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              bb_bw="2.25GBps" bb_lat="500us"/>  
 
     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              bb_bw="2.25GBps" bb_lat="500us"/>  
 

-     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  

 
 

-     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu" 
-              gw_dst="alicealice_cluster_router.crepe.fr">
-        <link_ctn id="backbone"/>
-     </ASroute>
+    <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu" 
+             gw_dst="alicealice_cluster_router.crepe.fr">
+       <link_ctn id="backbone"/>
+    </ASroute>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml
index 7c0e117883db3740664ca06af569bee7bd721664..bbaf0c9e748d03403cea5f8abc05e4313923f51b 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters_router_id.xml
+++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS  id="AS0"  routing="Full">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS  id="AS0"  routing="Full">

-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
-              bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
-              bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  

 
 

-     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  

 
 

-     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
-        <link_ctn id="backbone"/>
-     </ASroute>
-     <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
-        <link_ctn id="backbone"/>
-     </ASroute>
+    <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
+       <link_ctn id="backbone"/>
+    </ASroute>
+    <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
+       <link_ctn id="backbone"/>
+    </ASroute>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
index 5048e04023219f6f9f91588a622498fa3fb793db..15a3b024b35acc3a6c4847bd7fe0d269ada8e001 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -9,6 +9,10 @@
     <link id="link_alice" bandwidth="125MBps" latency="50us"/>
     <link id="switch" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
 
     <link id="link_alice" bandwidth="125MBps" latency="50us"/>
     <link id="switch" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
 

-    <route src="bob" dst="alice"><link_ctn id="link_bob"/><link_ctn id="switch"/><link_ctn id="link_alice"/></route>
+    <route src="bob" dst="alice">
+      <link_ctn id="link_bob"/>
+      <link_ctn id="switch"/>
+      <link_ctn id="link_alice"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml
index 6140f0ba9168127ff763d31572a3322b2d33f6a1..56e7e4b174dca2f28d0dce914cf00823b47b04de 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -7,6 +7,8 @@
 
     <link id="link1" bandwidth="125MBps" latency="50us"/>
 
 
     <link id="link1" bandwidth="125MBps" latency="50us"/>
 

-    <route src="bob" dst="alice"><link_ctn id="link1"/></route>
+    <route src="bob" dst="alice">
+      <link_ctn id="link1"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
index 25c944cce6b0f9c890c65de11765521221ae4a73..515fd537bc189eaf07f7c0edc666930414dd798d 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
@@ -7,7 +7,11 @@
 
     <link id="link1" bandwidth="125MBps" latency="50us" sharing_policy="FULLDUPLEX"/>
 
 
     <link id="link1" bandwidth="125MBps" latency="50us" sharing_policy="FULLDUPLEX"/>
 

-    <route src="alice" dst="bob" symmetrical="NO"><link_ctn id="link1" direction="UP"/></route>
-    <route src="bob" dst="alice" symmetrical="NO"><link_ctn id="link1" direction="DOWN"/></route>
+    <route src="alice" dst="bob" symmetrical="NO">
+      <link_ctn id="link1" direction="UP"/>
+    </route>
+    <route src="bob" dst="alice" symmetrical="NO">
+      <link_ctn id="link1" direction="DOWN"/>
+    </route>

   </AS>
 </platform>
   </AS>
 </platform>