more cleanups in XML files

diff --git a/examples/msg/actions/deployment_split.xml b/examples/msg/actions/deployment_split.xml
index 2613f34..f028595 100644 (file)
--- a/examples/msg/actions/deployment_split.xml
+++ b/examples/msg/actions/deployment_split.xml
@@ -1,12 +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">

-<!-- Example file of how to use trace replay, with actions split in
-     separate files, one per process.
+<!-- Example file of how to use trace replay, with actions split in separate files, one per process.

      Launch it like this:
      Launch it like this:

+         ./actions homogeneous_3_hosts.xml deployment_split.xml  -->

 
 

-  ./actions homogeneous_3_hosts.xml deployment_split.xml
--->

   <process host="Tremblay" function="p0">
     <argument value="actions_split_p0.txt"/>
   </process>
   <process host="Tremblay" function="p0">
     <argument value="actions_split_p0.txt"/>
   </process>

diff --git a/examples/msg/cloud/multicore_plat.xml b/examples/msg/cloud/multicore_plat.xml
index 3133c0c..23e7051 100644 (file)
--- a/examples/msg/cloud/multicore_plat.xml
+++ b/examples/msg/cloud/multicore_plat.xml
@@ -1,24 +1,15 @@
 <?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="siteA" routing="Full">
-               <host id="PM0" speed="1E8" core="1"/>
-               <host id="PM1" speed="1E8" core="2"/>
-               <host id="PM2" speed="1E8" core="4"/>
+  <AS id="siteA" routing="Full">
+    <host id="PM0" speed="1E8" core="1"/>
+    <host id="PM1" speed="1E8" core="2"/>
+    <host id="PM2" speed="1E8" core="4"/>

 
 

-               <!-- <link id="link1" bandwidth="1E6" latency="1E-2" /> -->
-               <link id="link1" bandwidth="12500000" latency="1E-2" />
+    <link id="link1" bandwidth="12500000" latency="1E-2" />

 
 

-               <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>
+    <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>
 </platform>

diff --git a/examples/msg/energy/consumption/deployment_consumption.xml b/examples/msg/energy/consumption/deployment_consumption.xml
index 73145d3..52ebe54 100644 (file)
--- a/examples/msg/energy/consumption/deployment_consumption.xml
+++ b/examples/msg/energy/consumption/deployment_consumption.xml
@@ -1,7 +1,5 @@
 <?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="MyHost1" function="dvfs_test" />
   <process host="MyHost1" function="dvfs_test" />

-

 </platform>
 </platform>

diff --git a/examples/msg/energy/onoff/deployment_onoff.xml b/examples/msg/energy/onoff/deployment_onoff.xml
index ba43e3e..9b90483 100644 (file)
--- a/examples/msg/energy/onoff/deployment_onoff.xml
+++ b/examples/msg/energy/onoff/deployment_onoff.xml
@@ -1,7 +1,5 @@
 <?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="MyHost2" function="onoff_test" />
   <process host="MyHost2" function="onoff_test" />

-

 </platform>
 </platform>

diff --git a/examples/msg/energy/onoff/platform_onoff.xml b/examples/msg/energy/onoff/platform_onoff.xml
index dd7620c..140398d 100644 (file)
--- a/examples/msg/energy/onoff/platform_onoff.xml
+++ b/examples/msg/energy/onoff/platform_onoff.xml
@@ -4,37 +4,29 @@
 <AS  id="AS0"  routing="Full">
 
   <!-- Use the pstate mechanism to encode the boot/shutdown time and energy -->
 <AS  id="AS0"  routing="Full">
 
   <!-- 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. 
-       
-       The same could be done to encode the time and energy to switch
-       between pstates. These times seem negligeable in our
-       experiments, but if they are important to you, now you know how
-       to do that. -->
-       
+
+  <!-- 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. -->
+

   <!-- pstate values:
   <!-- 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
-        
-       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. -->
-    
-    
+    * 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
+
+    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 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" />


@@ -46,6 +38,5 @@
 
   <link id="link1" bandwidth="100kBps" latency="0"/>
   <route src="MyHost1" dst="MyHost2"><link_ctn id="link1"/></route>
 
   <link id="link1" bandwidth="100kBps" latency="0"/>
   <route src="MyHost1" dst="MyHost2"><link_ctn id="link1"/></route>

-  

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

diff --git a/examples/msg/energy/pstate/deployment_pstate.xml b/examples/msg/energy/pstate/deployment_pstate.xml
index ea62669..a128713 100644 (file)
--- a/examples/msg/energy/pstate/deployment_pstate.xml
+++ b/examples/msg/energy/pstate/deployment_pstate.xml
@@ -3,5 +3,4 @@
 <platform version="4">
   <process host="MyHost1" function="dvfs_test" />
   <process host="MyHost2" function="dvfs_test" />
 <platform version="4">
   <process host="MyHost1" function="dvfs_test" />
   <process host="MyHost2" function="dvfs_test" />

-

 </platform>
 </platform>

diff --git a/examples/msg/energy/vm/deployment_consumption.xml b/examples/msg/energy/vm/deployment_consumption.xml
index 73145d3..52ebe54 100644 (file)
--- a/examples/msg/energy/vm/deployment_consumption.xml
+++ b/examples/msg/energy/vm/deployment_consumption.xml
@@ -1,7 +1,5 @@
 <?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="MyHost1" function="dvfs_test" />
   <process host="MyHost1" function="dvfs_test" />

-

 </platform>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_kill.xml b/examples/msg/masterslave/deployment_masterslave_kill.xml
index 0c673ef..ea69ac8 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_kill.xml
+++ b/examples/msg/masterslave/deployment_masterslave_kill.xml
@@ -1,5 +1,5 @@
 <?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"></process>
+  <process host="Tremblay" function="master"/>

 </platform>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_mailbox.xml b/examples/msg/masterslave/deployment_masterslave_mailbox.xml
index 8d37995..f0be059 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_mailbox.xml
+++ b/examples/msg/masterslave/deployment_masterslave_mailbox.xml
@@ -24,5 +24,4 @@
   <process host="Bourassa" function="slave">
     <argument value="4"/>
   </process>
   <process host="Bourassa" function="slave">
     <argument value="4"/>
   </process>

-

 </platform>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
index 9123191..571ec4a 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
+++ b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
@@ -27,5 +27,4 @@
   <process host="Tremblay" function="slave">
     <argument value="5"/>
   </process>
   <process host="Tremblay" function="slave">
     <argument value="5"/>
   </process>

-

 </platform>
 </platform>

diff --git a/examples/msg/masterslave/deployment_masterslave_vivaldi.xml b/examples/msg/masterslave/deployment_masterslave_vivaldi.xml
index f97f61c..239c7c5 100644 (file)
--- a/examples/msg/masterslave/deployment_masterslave_vivaldi.xml
+++ b/examples/msg/masterslave/deployment_masterslave_vivaldi.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">

-
-

   <!-- The master process (with some arguments) --> 
   <process host="100030591" function="master">
        <argument value="20"/>       <!-- Number of tasks -->
   <!-- The master process (with some arguments) --> 
   <process host="100030591" function="master">
        <argument value="20"/>       <!-- Number of tasks -->


@@ -11,121 +9,43 @@
        <argument value="39"/>         <!-- Number of slaves -->
     </process>
     <!-- The slave processes (with mailbox to listen on as argument) -->
        <argument value="39"/>         <!-- Number of slaves -->
     </process>
     <!-- The slave processes (with mailbox to listen on as argument) -->

-    <process host="100036570" function="slave">
-      <argument value="0"/>
-    </process>
-    <process host="100041334" function="slave">
-      <argument value="1"/>
-    </process>
-    <process host="100055671" function="slave">
-      <argument value="2"/>
-    </process>
-    <process host="100066658" function="slave">
-      <argument value="3"/>
-    </process>
-    <process host="100090691" function="slave">
-      <argument value="4"/>
-    </process>
-    <process host="100094952" function="slave">
-      <argument value="5"/>
-    </process>
-    <process host="100117943" function="slave">
-      <argument value="6"/>
-    </process>
-    <process host="100126290" function="slave">
-      <argument value="7"/>
-    </process>
-    <process host="100144483" function="slave">
-      <argument value="8"/>
-    </process>
-    <process host="100152889" function="slave">
-      <argument value="9"/>
-    </process>
-    <process host="100178474" function="slave">
-      <argument value="10"/>
-    </process>
-    <process host="100180261" function="slave">
-      <argument value="11"/>
-    </process>
-    <process host="100185883" function="slave">
-      <argument value="12"/>
-    </process>
-    <process host="100186365" function="slave">
-      <argument value="13"/>
-    </process>
-    <process host="100200866" function="slave">
-      <argument value="14"/>
-    </process>
-    <process host="100207885" function="slave">
-      <argument value="15"/>
-    </process>
-    <process host="100224447" function="slave">
-      <argument value="16"/>
-    </process>
-    <process host="100238799" function="slave">
-      <argument value="17"/>
-    </process>
-    <process host="100273297" function="slave">
-      <argument value="18"/>
-    </process>
-    <process host="100280711" function="slave">
-      <argument value="19"/>
-    </process>
-    <process host="100284574" function="slave">
-      <argument value="20"/>
-    </process>
-    <process host="100292843" function="slave">
-      <argument value="21"/>
-    </process>
-    <process host="100309685" function="slave">
-      <argument value="22"/>
-    </process>
-    <process host="100315281" function="slave">
-      <argument value="23"/>
-    </process>
-    <process host="100317715" function="slave">
-      <argument value="24"/>
-    </process>
-    <process host="100324694" function="slave">
-      <argument value="25"/>
-    </process>
-    <process host="100326641" function="slave">
-      <argument value="26"/>
-    </process>
-    <process host="100331484" function="slave">
-      <argument value="27"/>
-    </process>
-    <process host="100347816" function="slave">
-      <argument value="28"/>
-    </process>
-    <process host="100354536" function="slave">
-      <argument value="29"/>
-    </process>
-    <process host="100355017" function="slave">
-      <argument value="30"/>
-    </process>
-    <process host="100359203" function="slave">
-      <argument value="31"/>
-    </process>
-    <process host="100379397" function="slave">
-      <argument value="32"/>
-    </process>
-    <process host="100404046" function="slave">
-      <argument value="33"/>
-    </process>
-    <process host="100413314" function="slave">
-      <argument value="34"/>
-    </process>
-    <process host="100416828" function="slave">
-      <argument value="35"/>
-    </process>
-    <process host="100422926" function="slave">
-      <argument value="36"/>
-    </process>
-    <process host="100427449" function="slave">
-      <argument value="37"/>
-    </process>
-    <process host="100429957" function="slave">
-      <argument value="38"/>
-    </process>
-  </platform>
+    <process host="100036570" function="slave">   <argument value="0"/> </process>
+    <process host="100041334" function="slave">   <argument value="1"/> </process>
+    <process host="100055671" function="slave">   <argument value="2"/> </process>
+    <process host="100066658" function="slave">   <argument value="3"/> </process>
+    <process host="100090691" function="slave">   <argument value="4"/> </process>
+    <process host="100094952" function="slave">   <argument value="5"/> </process>
+    <process host="100117943" function="slave">   <argument value="6"/> </process>
+    <process host="100126290" function="slave">   <argument value="7"/> </process>
+    <process host="100144483" function="slave">   <argument value="8"/> </process>
+    <process host="100152889" function="slave">   <argument value="9"/> </process>
+    <process host="100178474" function="slave">   <argument value="10"/> </process>
+    <process host="100180261" function="slave">   <argument value="11"/> </process>
+    <process host="100185883" function="slave">   <argument value="12"/> </process>
+    <process host="100186365" function="slave">   <argument value="13"/> </process>
+    <process host="100200866" function="slave">   <argument value="14"/> </process>
+    <process host="100207885" function="slave">   <argument value="15"/> </process>
+    <process host="100224447" function="slave">   <argument value="16"/> </process>
+    <process host="100238799" function="slave">   <argument value="17"/> </process>
+    <process host="100273297" function="slave">   <argument value="18"/> </process>
+    <process host="100280711" function="slave">   <argument value="19"/> </process>
+    <process host="100284574" function="slave">   <argument value="20"/> </process>
+    <process host="100292843" function="slave">   <argument value="21"/> </process>
+    <process host="100309685" function="slave">   <argument value="22"/> </process>
+    <process host="100315281" function="slave">   <argument value="23"/> </process>
+    <process host="100317715" function="slave">   <argument value="24"/> </process>
+    <process host="100324694" function="slave">   <argument value="25"/> </process>
+    <process host="100326641" function="slave">   <argument value="26"/> </process>
+    <process host="100331484" function="slave">   <argument value="27"/> </process>
+    <process host="100347816" function="slave">   <argument value="28"/> </process>
+    <process host="100354536" function="slave">   <argument value="29"/> </process>
+    <process host="100355017" function="slave">   <argument value="30"/> </process>
+    <process host="100359203" function="slave">   <argument value="31"/> </process>
+    <process host="100379397" function="slave">   <argument value="32"/> </process>
+    <process host="100404046" function="slave">   <argument value="33"/> </process>
+    <process host="100413314" function="slave">   <argument value="34"/> </process>
+    <process host="100416828" function="slave">   <argument value="35"/> </process>
+    <process host="100422926" function="slave">   <argument value="36"/> </process>
+    <process host="100427449" function="slave">   <argument value="37"/> </process>
+    <process host="100429957" function="slave">   <argument value="38"/> </process>
+</platform>

diff --git a/examples/msg/mc/deploy_bugged1_liveness.xml b/examples/msg/mc/deploy_bugged1_liveness.xml
index aaf3b83..ad87a48 100644 (file)
--- a/examples/msg/mc/deploy_bugged1_liveness.xml
+++ b/examples/msg/mc/deploy_bugged1_liveness.xml
@@ -1,9 +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="coordinator" />
 
   <process host="Boivin" function="client" >
   <process host="Tremblay" function="coordinator" />
 
   <process host="Boivin" function="client" >


@@ -13,5 +10,4 @@
   <process host="Fafard" function="client" >
     <argument value="2"/>
   </process>
   <process host="Fafard" function="client" >
     <argument value="2"/>
   </process>

-

 </platform>
 </platform>

diff --git a/examples/msg/mc/deploy_bugged1_liveness_visited.xml b/examples/msg/mc/deploy_bugged1_liveness_visited.xml
index a9828dc..f8e8d9b 100644 (file)
--- a/examples/msg/mc/deploy_bugged1_liveness_visited.xml
+++ b/examples/msg/mc/deploy_bugged1_liveness_visited.xml
@@ -1,9 +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="coordinator" />
 
    <process host="Boivin" function="client" >
   <process host="Tremblay" function="coordinator" />
 
    <process host="Boivin" function="client" >


@@ -13,5 +10,4 @@
   <process host="Fafard" function="client" >
     <argument value="1"/>
   </process>
   <process host="Fafard" function="client" >
     <argument value="1"/>
   </process>

-

 </platform>
 </platform>

diff --git a/examples/msg/mc/deploy_bugged2_liveness.xml b/examples/msg/mc/deploy_bugged2_liveness.xml
index 42f5c81..547229c 100644 (file)
--- a/examples/msg/mc/deploy_bugged2_liveness.xml
+++ b/examples/msg/mc/deploy_bugged2_liveness.xml
@@ -1,9 +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="coordinator" />
 
   <process host="Fafard" function="client" >
   <process host="Tremblay" function="coordinator" />
 
   <process host="Fafard" function="client" >


@@ -13,5 +10,4 @@
   <process host="Boivin" function="client" >
     <argument value="2"/>
   </process>
   <process host="Boivin" function="client" >
     <argument value="2"/>
   </process>

-

 </platform>
 </platform>

diff --git a/examples/msg/mc/deploy_mutex.xml b/examples/msg/mc/deploy_mutex.xml
index c128e17..2ef4cd1 100644 (file)
--- a/examples/msg/mc/deploy_mutex.xml
+++ b/examples/msg/mc/deploy_mutex.xml
@@ -1,39 +1,22 @@
 <?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="coordinator" />
 
   <process host="Fafard" function="client" />
   <process host="Tremblay" function="coordinator" />
 
   <process host="Fafard" function="client" />

-

   <process host="Boivin" function="client" />
   <process host="Boivin" function="client" />

-

   <process host="TeX" function="client" />
   <process host="TeX" function="client" />

-

   <process host="Geoff" function="client" />
   <process host="Geoff" function="client" />

-  
+

   <!-- <process host="Disney" function="client" />
   <!-- <process host="Disney" function="client" />

-    

   <process host="iRMX" function="client" />
   <process host="iRMX" function="client" />

-      

   <process host="McGee" function="client" />
   <process host="McGee" function="client" />

-

   <process host="Gatien" function="client" />
   <process host="Gatien" function="client" />

-    

   <process host="Laroche" function="client" />
   <process host="Laroche" function="client" />

-      

   <process host="Tanguay" function="client" />
   <process host="Tanguay" function="client" />

-

   <process host="Morin" function="client" />
   <process host="Morin" function="client" />

-

   <process host="Ethernet" function="client" />
   <process host="Ethernet" function="client" />

-

   <process host="Bellemarre" function="client" />
   <process host="Bellemarre" function="client" />

-

   <process host="Kuenning" function="client" />
   <process host="Kuenning" function="client" />

-  

   <process host="Gaston" function="client" /> -->
   <process host="Gaston" function="client" /> -->

-

 </platform>
 </platform>

diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml
index 1969e02..b86fb71 100644 (file)
--- a/examples/msg/mc/platform.xml
+++ b/examples/msg/mc/platform.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="HostA" speed="137.333Mf"/>
    <host id="HostB" speed="98.095Mf"/>
  <AS  id="AS0"  routing="Full">
    <host id="HostA" speed="137.333Mf"/>
    <host id="HostB" speed="98.095Mf"/>


@@ -16,4 +14,3 @@
    <route src="HostA" dst="HostD"><link_ctn id="3"/></route>
  </AS>
  </platform>
    <route src="HostA" dst="HostD"><link_ctn id="3"/></route>
  </AS>
  </platform>

- 

diff --git a/examples/msg/properties/deployment_properties.xml b/examples/msg/properties/deployment_properties.xml
index 05c97ff..6b86cf3 100644 (file)
--- a/examples/msg/properties/deployment_properties.xml
+++ b/examples/msg/properties/deployment_properties.xml
@@ -1,14 +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">

-

   <process host="host1" function="alice" />
   <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="carole" />

-  

   <process host="host2" function="david" />
 </platform>
   <process host="host2" function="david" />
 </platform>

diff --git a/examples/msg/tracing/deployment.xml b/examples/msg/tracing/deployment.xml
index da45aa7..1efc8a7 100644 (file)
--- a/examples/msg/tracing/deployment.xml
+++ b/examples/msg/tracing/deployment.xml
@@ -14,5 +14,4 @@
   <process host="Fafard" function="slave"/>
   <process host="Ginette" function="slave"/>
   <process host="Bourassa" function="slave"/>
   <process host="Fafard" function="slave"/>
   <process host="Ginette" function="slave"/>
   <process host="Bourassa" function="slave"/>

-

 </platform>
 </platform>

diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml
index 82f379d..2505796 100644 (file)
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -1,86 +1,46 @@
 <?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">
 
   <AS id="AS0" routing="Full">

-    <storage_type id="SATA-II_HDD" size="500GB"
-                  content_type="txt_unix" 
-                  content="content/small_content.txt" 
-                  model="linear_no_lat">
+    <storage_type id="SATA-II_HDD" size="500GB" model="linear_no_lat"
+                  content_type="txt_unix" content="content/small_content.txt">

       <model_prop id="Bread" value="92MBps"/> 
       <model_prop id="Bwrite" value="62MBps"/> 
       <model_prop id="Bconnection" value="122MBps"/> 
     </storage_type>
 
       <model_prop id="Bread" value="92MBps"/> 
       <model_prop id="Bwrite" value="62MBps"/> 
       <model_prop id="Bconnection" value="122MBps"/> 
     </storage_type>
 

-    <storage id="Disk1" typeId="SATA-II_HDD"
-             attach="carl"/>
+    <storage id="Disk1" typeId="SATA-II_HDD" attach="carl"/>

 
 

-    <storage id="Disk2" typeId="SATA-II_HDD"
-             attach="dave"
-             content_type="txt_windows" 
-             content="content/win_storage_content.txt" />
+    <storage id="Disk2" typeId="SATA-II_HDD" attach="dave"
+             content_type="txt_windows" content="content/win_storage_content.txt" />

 
     <host id="alice" speed="1Gf">
 
     <host id="alice" speed="1Gf">

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

     </host>
     </host>

-

     <host id="bob" speed="1Gf">
     <host id="bob" speed="1Gf">

-      <mount storageId="Disk1" name="/scratch"/>                       
+      <mount storageId="Disk1" name="/scratch"/>

     </host>
     </host>

-

     <host id="carl" speed="1Gf">
     <host id="carl" speed="1Gf">

-      <mount storageId="Disk1" name="/scratch"/>                       
+      <mount storageId="Disk1" name="/scratch"/>

     </host>
     </host>

-

     <host id="dave" speed="1Gf">
     <host id="dave" speed="1Gf">

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

     </host>
 
     </host>
 

-    <link id="link1" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link2" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link3" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link4" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link5" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link6" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <route src="alice" dst="bob" symmetrical="YES">
-      <link_ctn id="link1"/>
-    </route>
-
-    <route src="alice" dst="carl" symmetrical="YES">
-      <link_ctn id="link2"/>
-    </route>
-
-    <route src="alice" dst="dave" symmetrical="YES">
-      <link_ctn id="link3"/>
-    </route>
-
-    <route src="bob" dst="carl" symmetrical="YES">
-      <link_ctn id="link4"/>
-    </route>
-
-    <route src="bob" dst="dave" symmetrical="YES">
-      <link_ctn id="link5"/>
-    </route>
-
-    <route src="carl" dst="dave" symmetrical="YES">
-      <link_ctn id="link6"/>
-    </route>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+    <link id="link4" bandwidth="125MBps" latency="50us"/>
+    <link id="link5" bandwidth="125MBps" latency="50us"/>
+    <link id="link6" bandwidth="125MBps" latency="50us"/>
+
+    <route src="alice" dst="bob" symmetrical="YES"><link_ctn id="link1"/></route>
+    <route src="alice" dst="carl" symmetrical="YES"><link_ctn id="link2"/></route>
+    <route src="alice" dst="dave" symmetrical="YES"><link_ctn id="link3"/></route>
+    <route src="bob" dst="carl" symmetrical="YES"><link_ctn id="link4"/></route>
+    <route src="bob" dst="dave" symmetrical="YES"><link_ctn id="link5"/></route>
+    <route src="carl" dst="dave" symmetrical="YES"><link_ctn id="link6"/></route>

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

diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml
index 379a0f0..081374f 100644 (file)
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -1,22 +1,17 @@
 <?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">
 
   <AS id="AS0" routing="Full">

-
-    <storage_type id="single_HDD" model="linear_no_lat" 
-                  content="content/storage_content.txt" size="500GiB"
-                  content_type="txt_unix">
+    <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" />
     </storage_type>
 
        <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" model="linear_no_lat" size="500GiB"
+    <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" />
                   content="content/storage_content.txt" content_type="txt_unix">
        <model_prop id="Bwrite" value="60MBps" />
        <model_prop id="Bread" value="200MBps" />


@@ -24,39 +19,28 @@
     </storage_type>
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />
     </storage_type>
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />

-    <storage id="Disk2" typeId="single_SSD"
-             content="content/win_storage_content.txt"
-             content_type="txt_windows" attach="alice" />
+    <storage id="Disk2" typeId="single_SSD" attach="alice"
+             content="content/win_storage_content.txt" content_type="txt_windows" />

     <storage id="Disk3" typeId="single_HDD" attach="carl" />
     <storage id="Disk3" typeId="single_HDD" attach="carl" />

-    <storage id="Disk4" typeId="single_SSD"
-             content="content/small_content.txt"
-             content_type="txt_unix" attach="denise"/>
+    <storage id="Disk4" typeId="single_SSD" attach="denise"
+             content="content/small_content.txt" content_type="txt_unix" />

 
     <host id="bob" speed="1Gf">
       <mount storageId="Disk1" name="/home"/>
     </host>
 
     <host id="bob" speed="1Gf">
       <mount storageId="Disk1" name="/home"/>
     </host>

-

     <host id="alice" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>
     </host>
     <host id="alice" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>
     </host>

-

     <host id="carl" speed="1Gf">
       <mount storageId="Disk3" name="/home"/>
     </host>
     <host id="carl" speed="1Gf">
       <mount storageId="Disk3" name="/home"/>
     </host>

-

     <host id="denise" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>     
       <mount storageId="Disk4" name="/home"/>  
     </host>
 
     <host id="denise" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>     
       <mount storageId="Disk4" name="/home"/>  
     </host>
 

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

 
 

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

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