From 49963d5bc5c1e580c71654fbd9b5e9776f389574 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 21 Jun 2016 09:37:50 +0200
Subject: [PATCH 1/1] track down remaining XML glitches

---
 .../msg/app-chainsend/app-chainsend_d.xml     |   3 +-
 .../msg/async-waitany/async-waitany_d.xml     |  12 +-
 examples/msg/dht-kademlia/dht-kademlia_d.xml  |   4 +-
 examples/msg/energy-onoff/platform_onoff.xml  |  64 +++++-----
 examples/msg/mc/deploy_bugged2.xml            |   3 +-
 examples/msg/mc/platform.xml                  |  32 +++--
 .../platform-properties_d.xml                 |   4 +-
 .../msg/process-startkilltime/baseline_d.xml  |   2 +-
 examples/platforms/cloud.xml                  |  15 ++-
 examples/platforms/g5k.xml                    | 118 +++++++++++-------
 examples/platforms/prop.xml                   |   9 +-
 examples/platforms/two_clusters.xml           |  22 ++--
 .../actions-comm/s4u_actions-comm_split_d.xml |   8 +-
 .../deployment_masterslave_mailbox_smpi.xml   |   8 +-
 14 files changed, 176 insertions(+), 128 deletions(-)

diff --git a/examples/msg/app-chainsend/app-chainsend_d.xml b/examples/msg/app-chainsend/app-chainsend_d.xml
index 0f59093af5..dd83afe682 100644
--- a/examples/msg/app-chainsend/app-chainsend_d.xml
+++ b/examples/msg/app-chainsend/app-chainsend_d.xml
@@ -10,7 +10,8 @@
 
   <!-- Peers -->
   <process host="node-1.acme.org" function="peer">
-    <argument value="1"/>  </process>
+    <argument value="1"/>
+  </process>
   <process host="node-2.acme.org" function="peer">
     <argument value="2"/>
   </process>
diff --git a/examples/msg/async-waitany/async-waitany_d.xml b/examples/msg/async-waitany/async-waitany_d.xml
index c6c38c8a8c..1972e413cf 100644
--- a/examples/msg/async-waitany/async-waitany_d.xml
+++ b/examples/msg/async-waitany/async-waitany_d.xml
@@ -3,18 +3,18 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="sender">
-   <argument value="6"/>       <!-- Number of tasks -->
-   <argument value="50000000"/>  <!-- Computation size of tasks -->
-   <argument value="1000000"/>      <!-- Communication size of tasks -->
-   <argument value="2"/>         <!-- Number of receivers -->
-   <argument value="0"/>         <!-- Use diff comm size -->
+    <argument value="6"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>      <!-- Communication size of tasks -->
+    <argument value="2"/>         <!-- Number of receivers -->
+    <argument value="0"/>         <!-- Use diff comm size -->
   </process>
   <!-- The receiver processes -->
   <process host="Fafard" function="receiver">
     <argument value="0"/>
     <argument value="3"/>       <!-- Number of tasks -->
   </process>
-    <process host="Jupiter" function="receiver">
+  <process host="Jupiter" function="receiver">
     <argument value="1"/>
     <argument value="3"/>       <!-- Number of tasks -->
   </process>
diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml
index 06278349fc..a63e6c9af6 100644
--- a/examples/msg/dht-kademlia/dht-kademlia_d.xml
+++ b/examples/msg/dht-kademlia/dht-kademlia_d.xml
@@ -59,12 +59,12 @@
     <argument value="0x01ff"/>          <!-- known id -->
     <argument value ="780"/>            <!-- deadline -->
   </process>
-   <process host="node-11.acme.org" function="node">
+  <process host="node-11.acme.org" function="node">
     <argument value="0x07ff"/>          <!-- my id -->
     <argument value="0x03ff"/>          <!-- known id -->
     <argument value ="780"/>            <!-- deadline -->
   </process>
-   <process host="node-12.acme.org" function="node">
+  <process host="node-12.acme.org" function="node">
     <argument value="0x0fff"/>          <!-- my id -->
     <argument value="0x0000"/>          <!-- known id -->
     <argument value ="780"/>            <!-- deadline -->
diff --git a/examples/msg/energy-onoff/platform_onoff.xml b/examples/msg/energy-onoff/platform_onoff.xml
index 03549c16d6..624a2ff1e4 100644
--- a/examples/msg/energy-onoff/platform_onoff.xml
+++ b/examples/msg/energy-onoff/platform_onoff.xml
@@ -1,42 +1,44 @@
 <?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">
 
-  <!-- Use the pstate mechanism to encode the boot/shutdown time and energy -->
+    <!-- Use the pstate mechanism to encode the boot/shutdown time and energy -->
 
-  <!-- That may be seen as a misuse of the pstate mechanism and crude hack, but this is efficient: we can do what 
-       we want without too much burden, and since the whole intelligence is at user level, we do control the model. 
+    <!-- That may be seen as a misuse of the pstate mechanism and crude hack, but this is efficient: we can do what 
+         we want without too much burden, and since the whole intelligence is at user level, we do control the model. 
 
-       The same could be done to encode the time and energy to switch between pstates. These times seem negligible 
-       in our experiments, but if they are important to you, now you know how to do that. -->
+         The same could be done to encode the time and energy to switch between pstates. These times seem negligible 
+         in our experiments, but if they are important to you, now you know how to do that. -->
 
-  <!-- pstate values:
-    * 0-2: real pstates
-       0: p1 100 MFlops/s, [idle: 95W -> full burning: 200W]
-       1: p2  50 MFlops/s, [idle: 93W -> full burning: 170W]
-       2: p3  20 MFlops/s, [idel: 90W -> full burning: 150W] 
-    * 3: booting up was measured to take 150s and 18000J.
-         So we create a pstate with 1 flop/150 s so that the application burns 1 flop in that virtual pstate to
-         simulate a boot.
-         Multiply everything by 1000 or whatever if this trick is too painful to you, that's the same by the end.
-         The energy consumption is 18000/150=120W
-    * 4: shuting down was measured to take 7 s and 770 J
+    <!-- pstate values:
+      * 0-2: real pstates
+         0: p1 100 MFlops/s, [idle: 95W -> full burning: 200W]
+         1: p2  50 MFlops/s, [idle: 93W -> full burning: 170W]
+         2: p3  20 MFlops/s, [idel: 90W -> full burning: 150W] 
+      * 3: booting up was measured to take 150s and 18000J.
+           So we create a pstate with 1 flop/150 s so that the application burns 1 flop in that virtual pstate to
+           simulate a boot.
+           Multiply everything by 1000 or whatever if this trick is too painful to you, that's the same by the end.
+           The energy consumption is 18000/150=120W
+      * 4: shutting down was measured to take 7 s and 770 J
 
-    Please note that we tried to put sensible values in this file but you should still take them with a grain of salt.
-    If you want a realistic simulation, you have to actually benchmark your platform and application, and use the 
-    values that are right for you. -->
+      Please note that we tried to put sensible values in this file but you should still take them with a grain of salt.
+      If you want a realistic simulation, you have to actually benchmark your platform and application, and use the 
+      values that are right for you. -->
 
-  <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf,                               0.006666667f,0.1429f" pstate="0" >
-        <prop id="watt_per_state" value="95.0:200.0,93.0:170.0,90.0:150.0,       120:120,110:110" />
-        <prop id="watt_off"       value="10" />
-  </host>
-  <host id="MyHost2" speed="100.0Mf" >
-        <prop id="watt_per_state" value="100.0:200.0" />
-        <prop id="watt_off"       value="10" />
-  </host>
+    <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf,                               0.006666667f,0.1429f" pstate="0" >
+      <prop id="watt_per_state" value="95.0:200.0,93.0:170.0,90.0:150.0,       120:120,110:110" />
+      <prop id="watt_off"       value="10" />
+    </host>
+    <host id="MyHost2" speed="100.0Mf" >
+      <prop id="watt_per_state" value="100.0:200.0" />
+      <prop id="watt_off"       value="10" />
+    </host>
 
-  <link id="link1" bandwidth="100kBps" latency="0"/>
-  <route src="MyHost1" dst="MyHost2"><link_ctn id="link1"/></route>
-</AS>
+    <link id="link1" bandwidth="100kBps" latency="0"/>
+    <route src="MyHost1" dst="MyHost2">
+      <link_ctn id="link1"/>
+    </route>
+  </AS>
 </platform>
diff --git a/examples/msg/mc/deploy_bugged2.xml b/examples/msg/mc/deploy_bugged2.xml
index de395179cb..c6dbe05b90 100644
--- a/examples/msg/mc/deploy_bugged2.xml
+++ b/examples/msg/mc/deploy_bugged2.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="HostA" function="server">
-    <argument value="0"/>  </process>
+    <argument value="0"/>
+  </process>
   <process host="HostB" function="client">
     <argument value="1"/>
   </process>
diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml
index b86fb71542..3149f5c4bb 100644
--- a/examples/msg/mc/platform.xml
+++ b/examples/msg/mc/platform.xml
@@ -1,16 +1,22 @@
 <?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="HostA" speed="137.333Mf"/>
-   <host id="HostB" speed="98.095Mf"/>
-   <host id="HostC" speed="98.095Mf"/>
-   <host id="HostD" speed="98.095Mf"/>
-   <link id="1" bandwidth="3.430125MBps" latency="536.941us"/>
-   <link id="2" bandwidth="3.430125MBps" latency="536.941us"/>
-   <link id="3" bandwidth="3.430125MBps" latency="536.941us"/>
-   <route src="HostA" dst="HostB"><link_ctn id="1"/></route>
-   <route src="HostA" dst="HostC"><link_ctn id="2"/></route>
-   <route src="HostA" dst="HostD"><link_ctn id="3"/></route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="HostA" speed="137.333Mf"/>
+    <host id="HostB" speed="98.095Mf"/>
+    <host id="HostC" speed="98.095Mf"/>
+    <host id="HostD" speed="98.095Mf"/>
+    <link id="1" bandwidth="3.430125MBps" latency="536.941us"/>
+    <link id="2" bandwidth="3.430125MBps" latency="536.941us"/>
+    <link id="3" bandwidth="3.430125MBps" latency="536.941us"/>
+    <route src="HostA" dst="HostB">
+      <link_ctn id="1"/>
+    </route>
+    <route src="HostA" dst="HostC">
+      <link_ctn id="2"/>
+    </route>
+    <route src="HostA" dst="HostD">
+      <link_ctn id="3"/>
+    </route>
+  </AS>
+</platform>
diff --git a/examples/msg/platform-properties/platform-properties_d.xml b/examples/msg/platform-properties/platform-properties_d.xml
index 6b86cf3333..98d35908b8 100644
--- a/examples/msg/platform-properties/platform-properties_d.xml
+++ b/examples/msg/platform-properties/platform-properties_d.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <process host="host1" function="alice" />
-  <process host="host1" function="bob">       <prop id="SomeProp" value="SomeValue"/>   </process>
+  <process host="host1" function="bob">
+    <prop id="SomeProp" value="SomeValue"/>
+  </process>
   <process host="host2" function="carole" />
   <process host="host2" function="david" />
 </platform>
diff --git a/examples/msg/process-startkilltime/baseline_d.xml b/examples/msg/process-startkilltime/baseline_d.xml
index c3dca22b81..bc19db1195 100644
--- a/examples/msg/process-startkilltime/baseline_d.xml
+++ b/examples/msg/process-startkilltime/baseline_d.xml
@@ -3,6 +3,6 @@
 <platform version="4">
   <!-- Just sleeps for 10 seconds and quits -->
   <process host="node-0.acme.org" function="sleeper">  
-   <argument value="10"/>
+    <argument value="10"/>
   </process>
 </platform>
diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 5c94ae68c4..33308fd982 100644
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -313,23 +313,28 @@
       </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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <link_ctn id="link_dc3_cb4"/>
+        <link_ctn id="link_dc3_cb1"/>
       </ASroute>
 
       <!-- routes to exit AS -->
diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 6e62453683..3c13495c37 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -24,23 +24,33 @@
       <link id="Marseille_Sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
       <link id="Marseille_Toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-      <route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
+      <route src="lille" dst="paris">
+        <link_ctn id="Lille_Paris"/>
+      </route>
       <route src="paris" dst="nancy">
-        <link_ctn id="Paris_Nancy"/></route>
+        <link_ctn id="Paris_Nancy"/>
+      </route>
       <route src="paris" dst="rennes">
-        <link_ctn id="Paris_Rennes"/></route>
+        <link_ctn id="Paris_Rennes"/>
+      </route>
       <route src="paris" dst="lyon">
-        <link_ctn id="Paris_Lyon"/></route>
+        <link_ctn id="Paris_Lyon"/>
+      </route>
       <route src="bordeaux" dst="lyon">
-        <link_ctn id="Bordeaux_Lyon"/></route>
+        <link_ctn id="Bordeaux_Lyon"/>
+      </route>
       <route src="lyon" dst="grenoble">
-        <link_ctn id="Lyon_Grenoble"/></route>
+        <link_ctn id="Lyon_Grenoble"/>
+      </route>
       <route src="lyon" dst="marseille">
-        <link_ctn id="Lyon_Marseille"/></route>
+        <link_ctn id="Lyon_Marseille"/>
+      </route>
       <route src="marseille" dst="sophia">
-        <link_ctn id="Marseille_Sophia"/></route>
+        <link_ctn id="Marseille_Sophia"/>
+      </route>
       <route src="marseille" dst="toulouse">
-        <link_ctn id="Marseille_Toulouse"/></route>
+        <link_ctn id="Marseille_Toulouse"/>
+      </route>
     </AS>
     <AS id="AS_bordeaux" routing="Full">
       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr" radical="1-51" speed="5.2297E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
@@ -58,13 +68,16 @@
       <link id="link_gw_bordeaux" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-         <link_ctn id="link_bordeplage"/><link_ctn id="link_bordereau"/>
+         <link_ctn id="link_bordeplage"/>
+         <link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-        <link_ctn id="link_borderline"/><link_ctn id="link_bordereau"/>
+        <link_ctn id="link_borderline"/>
+        <link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr">
-        <link_ctn id="link_borderline"/><link_ctn id="link_bordeplage"/>
+        <link_ctn id="link_borderline"/>
+        <link_ctn id="link_bordeplage"/>
       </ASroute>
 
       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
@@ -74,7 +87,7 @@
         <link_ctn id="link_bordeplage"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
-          <link_ctn id="link_borderline"/>
+        <link_ctn id="link_borderline"/>
       </ASroute>
    </AS>
 
@@ -144,7 +157,8 @@
         <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
-        <link_ctn id="link_chimint"/><link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chimint"/>
+        <link_ctn id="link_chirloute"/>
       </ASroute>
  
       <ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
@@ -187,14 +201,15 @@
       <link id="link_gw_lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_capricorne" dst="AS_sagittaire" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr">
-          <link_ctn id="link_capricorne"/><link_ctn id="link_sagittaire"/>
+        <link_ctn id="link_capricorne"/>
+        <link_ctn id="link_sagittaire"/>
       </ASroute>
 
       <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon">
-          <link_ctn id="link_sagittaire"/>
+        <link_ctn id="link_sagittaire"/>
       </ASroute>
       <ASroute src="AS_capricorne" dst="gw_AS_lyon" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="gw_lyon">
-          <link_ctn id="link_capricorne"/>
+        <link_ctn id="link_capricorne"/>
       </ASroute>
     </AS>
 
@@ -266,9 +281,11 @@
 
         <ASroute src="AS_sgriffon1" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
-        </ASroute><ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+        </ASroute>
+        <ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
-        </ASroute><ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+        </ASroute>
+        <ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
         </ASroute>
         </AS>
@@ -280,11 +297,12 @@
       <link id="link_gw_nancy" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_griffon" dst="AS_graphene" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
-          <link_ctn id="link_griffon"/><link_ctn id="link_graphene"/>
+        <link_ctn id="link_griffon"/>
+        <link_ctn id="link_graphene"/>
       </ASroute>
 
       <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy">
-          <link_ctn id="link_graphene"/>
+        <link_ctn id="link_graphene"/>
       </ASroute>
       <ASroute src="AS_griffon" dst="gw_AS_nancy" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="gw_nancy">
           <link_ctn id="link_griffon"/>
@@ -521,13 +539,14 @@
       <link id="link_gw_orsay" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_gdx" dst="AS_netgdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr">
-          <link_ctn id="link_gdx"/><link_ctn id="link_netgdx"/>
+        <link_ctn id="link_gdx"/>
+        <link_ctn id="link_netgdx"/>
       </ASroute>
 
       <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
-          <link_ctn id="link_netgdx"/>
+        <link_ctn id="link_netgdx"/>
       </ASroute><ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
-          <link_ctn id="link_gdx"/>
+        <link_ctn id="link_gdx"/>
       </ASroute>
     </AS>
 
@@ -550,34 +569,40 @@
       <link id="link_gw_rennes" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_parapluie" dst="AS_paradent" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapluie"/><link_ctn id="link_paradent"/>
+        <link_ctn id="link_parapluie"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="AS_paradent" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapide"/><link_ctn id="link_paradent"/>
+        <link_ctn id="link_parapide"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="AS_parapluie" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapide"/><link_ctn id="link_parapluie"/>
+        <link_ctn id="link_parapide"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="AS_paradent" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_paradent"/>
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_paradent"/>
       </ASroute><ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_parapluie"/>
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="AS_parapide" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_parapide"/>
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_parapide"/>
       </ASroute>
 
       <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_paradent"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapluie" dst="gw_AS_rennes" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_parapluie"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="gw_AS_rennes" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_parapide"/>
+        <link_ctn id="link_parapide"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="gw_AS_rennes" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_paramount"/>
+        <link_ctn id="link_paramount"/>
       </ASroute>
     </AS>
 
@@ -597,23 +622,23 @@
       <link id="link_gw_sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_helios" dst="AS_sol" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr">
-          <link_ctn id="link_helios"/><link_ctn id="link_sol"/>
+        <link_ctn id="link_helios"/><link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_suno" dst="AS_sol" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr">
-          <link_ctn id="link_suno"/><link_ctn id="link_sol"/>
+        <link_ctn id="link_suno"/><link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_suno" dst="AS_helios" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr">
-          <link_ctn id="link_suno"/><link_ctn id="link_helios"/>
+        <link_ctn id="link_suno"/><link_ctn id="link_helios"/>
       </ASroute>
 
       <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_sol"/>
+        <link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_helios" dst="gw_AS_sophia" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_helios"/>
+        <link_ctn id="link_helios"/>
       </ASroute>
       <ASroute src="AS_suno" dst="gw_AS_sophia" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_suno"/>
+        <link_ctn id="link_suno"/>
       </ASroute>
     </AS>
 
@@ -630,16 +655,17 @@
       <link id="link_gw_toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_violette" dst="AS_pastel" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr">
-          <link_ctn id="link_violette"/>
-          <link_ctn id="link_pastel"/>
+        <link_ctn id="link_violette"/>
+        <link_ctn id="link_pastel"/>
       </ASroute>
 
       <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
-          <link_ctn id="link_pastel"/>
-      </ASroute><ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
-          <link_ctn id="link_violette"/>
+        <link_ctn id="link_pastel"/>
       </ASroute>
-   </AS>
+      <ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
+        <link_ctn id="link_violette"/>
+      </ASroute>
+    </AS>
 
     <ASroute src="AS_toulouse" dst="AS_interne" gw_src="gw_toulouse" gw_dst="toulouse">
       <link_ctn id="link_gw_toulouse"/>
diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index b65f1db167..eb22be66fd 100644
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -9,11 +9,11 @@
     <prop id="author" value="pnavarro"/>
 
     <AS id="AS3"  routing="Full">
-       <AS id="AS1" routing="None">
-         <prop id="name" value="AS1"/>
+      <AS id="AS1" routing="None">
+        <prop id="name" value="AS1"/>
       </AS>
       <AS id="AS2" routing="None">
-         <prop id="name" value="AS2"/>
+        <prop id="name" value="AS2"/>
      </AS>
     </AS>
 
@@ -40,7 +40,8 @@
         <prop id="type" value="ethernet"/>
       </link>
 
-      <route src="host1" dst="host2"><link_ctn id="l1"/>
+      <route src="host1" dst="host2">
+        <link_ctn id="l1"/>
         <link_ctn id="l2"/>
       </route>
     </AS>
diff --git a/examples/platforms/two_clusters.xml b/examples/platforms/two_clusters.xml
index d26bc29bdf..bc8567845a 100644
--- a/examples/platforms/two_clusters.xml
+++ b/examples/platforms/two_clusters.xml
@@ -22,18 +22,18 @@ node-0.acme.org                     node-9.acme.org            |
       |                                |
 node-10.acme.org               node-19.acme.org -->
 
-<AS id="AS0" routing="Full">
-  <cluster id="my_cluster_1" prefix="node-" suffix=".acme.org" radical="0-9" speed="1Gf" 
-           bw="125MBps" lat="50us" bb_bw="2.25GBps" bb_lat="500us" />
+  <AS id="AS0" routing="Full">
+    <cluster id="my_cluster_1" prefix="node-" suffix=".acme.org" radical="0-9" speed="1Gf" 
+             bw="125MBps" lat="50us" bb_bw="2.25GBps" bb_lat="500us" />
 
-  <cluster id="my_cluster_2" prefix="node-" suffix=".acme.org" radical="10-19" speed="1Gf" 
-           bw="125MBps" lat="50us" bb_bw="2.25GBps" bb_lat="500us" />
+    <cluster id="my_cluster_2" prefix="node-" suffix=".acme.org" radical="10-19" 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="my_cluster_1" dst="my_cluster_2" gw_src="node-my_cluster_1_router.acme.org"
-    gw_dst="node-my_cluster_2_router.acme.org">
-    <link_ctn id="backbone" />
-  </ASroute>
-</AS>
+    <ASroute src="my_cluster_1" dst="my_cluster_2" gw_src="node-my_cluster_1_router.acme.org"
+             gw_dst="node-my_cluster_2_router.acme.org">
+      <link_ctn id="backbone" />
+    </ASroute>
+  </AS>
 </platform>
diff --git a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml b/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
index 64fc192bd7..a88cf278f0 100644
--- a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
+++ b/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
@@ -5,6 +5,10 @@
      Launch it like this:
          ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
 
-  <process host="Tremblay" function="p0">    <argument value="s4u_actions-comm_split_p0.txt"/>  </process>
-  <process host="Ruby"     function="p1">    <argument value="s4u_actions-comm_split_p1.txt"/>  </process>
+  <process host="Tremblay" function="p0">
+    <argument value="s4u_actions-comm_split_p0.txt"/>
+  </process>
+  <process host="Ruby"     function="p1">
+    <argument value="s4u_actions-comm_split_p1.txt"/>
+  </process>
 </platform>
diff --git a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
index c7dbb185a2..e879f74557 100644
--- a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
+++ b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
@@ -3,10 +3,10 @@
 <platform version="4">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="master">
-     <argument value="20"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="1"/>         <!-- Number of slaves -->
+    <argument value="20"/>       <!-- Number of tasks -->
+    <argument value="50000000"/>  <!-- Computation size of tasks -->
+    <argument value="1000000"/>   <!-- Communication size of tasks -->
+    <argument value="1"/>         <!-- Number of slaves -->
   </process>
   <!-- The slave processes (with mailbox to listen on as argument) -->
   <process host="Tremblay" function="slave">
-- 
2.20.1