cosmetics in XML files

diff --git a/examples/msg/gtnets/crosstraffic-d.xml b/examples/msg/gtnets/crosstraffic-d.xml
index 83f3ace..212bca5 100644 (file)
--- a/examples/msg/gtnets/crosstraffic-d.xml
+++ b/examples/msg/gtnets/crosstraffic-d.xml
@@ -1,46 +1,36 @@
 <?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="S1" function="master">
       <argument value="1000000"/>
       <argument value="C1"/>
       <argument value="1"/>
   </process>
   <process host="S1" function="master">
       <argument value="1000000"/>
       <argument value="C1"/>
       <argument value="1"/>
   </process>

-

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

-

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

-

   <process host="C1" function="slave">
     <argument value="2"/>
   </process>
   <process host="C1" function="slave">
     <argument value="2"/>
   </process>

- 

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

-

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

-
-

   <process host="C1" function="master">
       <argument value="1000000"/>
       <argument value="S1"/>
       <argument value="4"/>
   </process>
   <process host="C1" function="master">
       <argument value="1000000"/>
       <argument value="S1"/>
       <argument value="4"/>
   </process>

-

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

- 

 </platform>
 </platform>

diff --git a/examples/msg/gtnets/dogbone-d.xml b/examples/msg/gtnets/dogbone-d.xml
index fd47721..a0cffd8 100644 (file)
--- a/examples/msg/gtnets/dogbone-d.xml
+++ b/examples/msg/gtnets/dogbone-d.xml
@@ -1,19 +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">

-

   <process host="S1" function="master">
       <argument value="10000"/>
       <argument value="C1"/>
       <argument value="0"/>
   </process>
   <process host="S1" function="master">
       <argument value="10000"/>
       <argument value="C1"/>
       <argument value="0"/>
   </process>

-

   <process host="S2" function="master">
       <argument value="10000"/>
       <argument value="C2"/>
       <argument value="1"/>
   </process>
   <process host="S2" function="master">
       <argument value="10000"/>
       <argument value="C2"/>
       <argument value="1"/>
   </process>

-

   <process host="C1" function="slave">
       <argument value="0"/>
   </process>
   <process host="C1" function="slave">
       <argument value="0"/>
   </process>

diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index b446855..2e9b2eb 100644 (file)
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -1,69 +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">
- <!---  dogbone
- -->
- 
- 
-   <host id="S1" speed="1Gf"/>
-   <host id="C1" speed="1Gf"/>
-   <host id="S2" speed="1Gf"/>
-   <host id="C2" speed="1Gf"/>
-   <router id="R1"/>
-   <router id="R2"/>
- 
-   <link id="1" bandwidth="100MBps" latency="10ms"/>
-   <link id="2" bandwidth="100MBps" latency="10ms"/>
-   <link id="3" bandwidth="100MBps" latency="10ms"/>
-   <link id="4" bandwidth="100MBps" latency="10ms"/>
-   <link id="5" bandwidth="100MBps" latency="10ms"/>
- 
- 
-   <route src="S1" dst="C1">
-      <link_ctn id="1"/>
-      <link_ctn id="2"/>
-      <link_ctn id="3"/>
-   </route>
- 
-   <route src="S2" dst="C2">
-      <link_ctn id="4"/>
-      <link_ctn id="2"/>
-      <link_ctn id="5"/>
-   </route>
- 
-   <route src="S1" dst="C2">
-      <link_ctn id="1"/>
-      <link_ctn id="2"/>
-      <link_ctn id="5"/>
-   </route>
- 
-   <route src="S2" dst="C1">
-      <link_ctn id="4"/>
-      <link_ctn id="2"/>
-      <link_ctn id="3"/>
-   </route>
- 
-   <route src="S1" dst="R1">
-      <link_ctn id="1"/>
-   </route>
- 
-   <route src="R1" dst="R2">
-      <link_ctn id="2"/>
-   </route>
- 
-   <route src="R2" dst="C1">
-      <link_ctn id="3"/>
-   </route>
- 
-   <route src="S2" dst="R1">
-      <link_ctn id="4"/>
-   </route>
- 
-   <route src="R2" dst="C2">
-      <link_ctn id="5"/>
-   </route>
- </AS>
- </platform>
+<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"/>
+
+  <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>

diff --git a/examples/msg/gtnets/onelink-d.xml b/examples/msg/gtnets/onelink-d.xml
index 631ee5d..a3450be 100644 (file)
--- a/examples/msg/gtnets/onelink-d.xml
+++ b/examples/msg/gtnets/onelink-d.xml
@@ -1,15 +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="S1" function="master">
       <argument value="1000000"/>
       <argument value="C1"/>
       <argument value="1"/>
   </process>
   <process host="S1" function="master">
       <argument value="1000000"/>
       <argument value="C1"/>
       <argument value="1"/>
   </process>

-

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

-  

 </platform>
 </platform>

diff --git a/examples/msg/gtnets/onelink-p.xml b/examples/msg/gtnets/onelink-p.xml
index 396dbca..36aa542 100644 (file)
--- a/examples/msg/gtnets/onelink-p.xml
+++ b/examples/msg/gtnets/onelink-p.xml
@@ -1,22 +1,13 @@
 <?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">
- <!---   S1  ________ C1
-              link 1
-             100MB, 5ms
- -->
- 
+<AS  id="AS0"  routing="Full">
+  <!---   S1 -- link 1 -- C1
+              (10kB, 10ms)      -->
+

    <host id="S1" speed="1Gf"/>
    <host id="C1" speed="1Gf"/>
    <host id="S1" speed="1Gf"/>
    <host id="C1" speed="1Gf"/>

- 

    <link id="1" bandwidth="10kBps" latency="10ms"/>
    <link id="1" bandwidth="10kBps" latency="10ms"/>

- 
-   <route src="S1" dst="C1">
-      <link_ctn id="1"/>
-   </route>
- 
- </AS>
- </platform>
+   <route src="S1" dst="C1"><link_ctn id="1"/></route>
+</AS>
+</platform>

diff --git a/examples/msg/ns3/3hosts_2links_d.xml b/examples/msg/ns3/3hosts_2links_d.xml
index 84fd185..915c5c8 100644 (file)
--- a/examples/msg/ns3/3hosts_2links_d.xml
+++ b/examples/msg/ns3/3hosts_2links_d.xml
@@ -1,15 +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="Tremblay" function="master">
       <argument value="100"/>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
   <process host="Tremblay" function="master">
       <argument value="100"/>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>

-

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

-

 </platform>
 </platform>

diff --git a/examples/msg/ns3/3links-d-timer.xml b/examples/msg/ns3/3links-d-timer.xml
index 76225f5..ee686fd 100644 (file)
--- a/examples/msg/ns3/3links-d-timer.xml
+++ b/examples/msg/ns3/3links-d-timer.xml
@@ -1,52 +1,42 @@
 <?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="Tremblay" function="master">
       <argument value="100000"/>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
   <process host="Tremblay" function="master">
       <argument value="100000"/>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>

-

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

-

   <process host="Fafard" function="master">
       <argument value="1000000"/>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>
   <process host="Fafard" function="master">
       <argument value="1000000"/>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>

-

   <process host="Ginette" function="slave">
     <argument value="2"/>
   </process>
   <process host="Ginette" function="slave">
     <argument value="2"/>
   </process>

-

   <process host="Bourassa" function="master">
       <argument value="2000000"/>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>
   <process host="Bourassa" function="master">
       <argument value="2000000"/>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>

-

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

-

   <process host="Bourassa" function="master" start_time="2.0">
       <argument value="2000000"/>
       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">
       <argument value="2000000"/>
       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>

-

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

-

   <process host="Lovelace" function="timer">
     <argument value="0"/>
     <argument value=".1"/>
   </process>
   <process host="Lovelace" function="timer">
     <argument value="0"/>
     <argument value=".1"/>
   </process>

-

   <process host="Lovelace" function="timer" start_time="2.0">
     <argument value="0"/>
     <argument value=".1"/>
   <process host="Lovelace" function="timer" start_time="2.0">
     <argument value="0"/>
     <argument value=".1"/>

diff --git a/examples/msg/ns3/3links-d.xml b/examples/msg/ns3/3links-d.xml
index 0c62860..41da034 100644 (file)
--- a/examples/msg/ns3/3links-d.xml
+++ b/examples/msg/ns3/3links-d.xml
@@ -1,7 +1,6 @@
 <?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="Tremblay" function="master">
       <argument value="100000"/>
       <argument value="Jupiter"/>
   <process host="Tremblay" function="master">
       <argument value="100000"/>
       <argument value="Jupiter"/>


@@ -10,7 +9,6 @@
   <process host="Jupiter" function="slave">
     <argument value="1"/>
   </process>
   <process host="Jupiter" function="slave">
     <argument value="1"/>
   </process>

-

   <process host="Fafard" function="master">
       <argument value="1000000"/>
       <argument value="Ginette"/>
   <process host="Fafard" function="master">
       <argument value="1000000"/>
       <argument value="Ginette"/>


@@ -19,7 +17,6 @@
   <process host="Ginette" function="slave">
     <argument value="2"/>
   </process>
   <process host="Ginette" function="slave">
     <argument value="2"/>
   </process>

-

   <process host="Bourassa" function="master">
       <argument value="2000000"/>
       <argument value="Lovelace"/>
   <process host="Bourassa" function="master">
       <argument value="2000000"/>
       <argument value="Lovelace"/>

diff --git a/examples/msg/ns3/One_cluster-d.xml b/examples/msg/ns3/One_cluster-d.xml
index dfdc890..98102d2 100644 (file)
--- a/examples/msg/ns3/One_cluster-d.xml
+++ b/examples/msg/ns3/One_cluster-d.xml
@@ -1,15 +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="node-2.acme.org" function="master">
       <argument value="100"/>
       <argument value="node-6.acme.org"/>
       <argument value="1"/>
   </process>
   <process host="node-2.acme.org" function="master">
       <argument value="100"/>
       <argument value="node-6.acme.org"/>
       <argument value="1"/>
   </process>

-

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

-     

 </platform>
 </platform>

diff --git a/examples/msg/ns3/Two_clusters-d.xml b/examples/msg/ns3/Two_clusters-d.xml
index c6744b5..81d1aef 100644 (file)
--- a/examples/msg/ns3/Two_clusters-d.xml
+++ b/examples/msg/ns3/Two_clusters-d.xml
@@ -1,15 +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="node-3.acme.org" function="master">
       <argument value="100"/>
       <argument value="node-16.acme.org"/>
       <argument value="1"/>
   </process>
   <process host="node-3.acme.org" function="master">
       <argument value="100"/>
       <argument value="node-16.acme.org"/>
       <argument value="1"/>
   </process>

-

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

-     

 </platform>
 </platform>

diff --git a/examples/simdag/2clusters.xml b/examples/simdag/2clusters.xml
index f282f98..d12b59c 100644 (file)
--- a/examples/simdag/2clusters.xml
+++ b/examples/simdag/2clusters.xml
@@ -1,8 +1,6 @@
 <?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="C2-06" speed="5Gf"/>
    <host id="C1-03" speed="1Gf"/>
  <AS  id="AS0"  routing="Full">
    <host id="C2-06" speed="5Gf"/>
    <host id="C1-03" speed="1Gf"/>

diff --git a/examples/simdag/faulty_host.xml b/examples/simdag/faulty_host.xml
index e75f426..cbd5a03 100644 (file)
--- a/examples/simdag/faulty_host.xml
+++ b/examples/simdag/faulty_host.xml
@@ -1,12 +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">
-   <host id="Faulty Host" speed="1Gf"
-         state_file="faulty_host.trace"/>
-   <host id="Safe Host" speed="500Mf"/>
- </AS>
- </platform>
- 
+<AS  id="AS0"  routing="Full">
+  <host id="Faulty Host" speed="1Gf" state_file="faulty_host.trace"/>
+  <host id="Safe Host" speed="500Mf"/>
+</AS>
+</platform>
+

diff --git a/examples/simdag/two_hosts.xml b/examples/simdag/two_hosts.xml
index f65fb43..025f900 100644 (file)
--- a/examples/simdag/two_hosts.xml
+++ b/examples/simdag/two_hosts.xml
@@ -1,23 +1,18 @@
 <?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="Tremblay" speed="25Mf"/>
-     <host id="Jupiter" speed="25Mf" 
-           availability_file="jupiter_power.trace"/>
+  <AS id="AS0" routing="Full">
+    <host id="Tremblay" speed="25Mf"/>
+    <host id="Jupiter" speed="25Mf" availability_file="jupiter_power.trace"/>

 
 

-     <link id="1" bandwidth="125MBps" latency="100us" 
-           bandwidth_file="link1_avail.trace"/>
-     
-     <route src="Tremblay" dst="Jupiter">
-       <link_ctn id="1"/>
-     </route>
-   </AS>
+    <link id="1" bandwidth="125MBps" latency="100us" bandwidth_file="link1_avail.trace"/>

 
 

-   <trace id="Tremblay_power" periodicity="6.0">
-     1.0 0.5
-     4.0 1.0
-   </trace>
+    <route src="Tremblay" dst="Jupiter"><link_ctn id="1"/></route>
+  </AS>

 
 

-   <trace_connect trace="Tremblay_power" element="Tremblay" kind="SPEED"/>
-</platform>  
+  <trace id="Tremblay_power" periodicity="6.0">
+    1.0 0.5
+    4.0 1.0
+  </trace>
+  <trace_connect trace="Tremblay_power" element="Tremblay" kind="SPEED"/>
+</platform>