Update all our XML files + next XML version will be 4.1, not 5

author Martin Quinson <martin.quinson@loria.fr>

Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)

committer Martin Quinson <martin.quinson@loria.fr>

Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
author Martin Quinson <martin.quinson@loria.fr>
Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
committer Martin Quinson <martin.quinson@loria.fr>
Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
diff --git a/doc/msg-tuto-src/deployment0.xml b/doc/msg-tuto-src/deployment0.xml

index 4746b97a3e1be39857477e162497468f8b5b89eb..a9fe0365de9d53507db2dd8bc8454af23f4d4f5b 100644 (file)
--- a/doc/msg-tuto-src/deployment0.xml
+++ b/doc/msg-tuto-src/deployment0.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="20"/>       <!-- Number of tasks -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="1000000"/>   <!-- Communication size of tasks -->
@@ -11,11 +11,11 @@
       <argument value="Ginette"/>  <!-- Third worker -->
       <argument value="Bourassa"/> <!-- Last worker -->
       <argument value="Tremblay"/> <!-- Me! I can work too! -->
       <argument value="Ginette"/>  <!-- Third worker -->
       <argument value="Bourassa"/> <!-- Last worker -->
       <argument value="Tremblay"/> <!-- Me! I can work too! -->
-  </process>
-  <!-- The worker process (with no argument) -->
-  <process host="Tremblay" function="worker" on_failure="RESTART"/>
-  <process host="Jupiter" function="worker" on_failure="RESTART"/>
-  <process host="Fafard" function="worker" on_failure="RESTART"/>
-  <process host="Ginette" function="worker" on_failure="RESTART"/>
-  <process host="Bourassa" function="worker" on_failure="RESTART"/>
+  </actor>
+  <!-- The worker actor (with no argument) -->
+  <actor host="Tremblay" function="worker" on_failure="RESTART"/>
+  <actor host="Jupiter" function="worker" on_failure="RESTART"/>
+  <actor host="Fafard" function="worker" on_failure="RESTART"/>
+  <actor host="Ginette" function="worker" on_failure="RESTART"/>
+  <actor host="Bourassa" function="worker" on_failure="RESTART"/>
  </platform>
  </platform>
diff --git a/doc/msg-tuto-src/deployment1.xml b/doc/msg-tuto-src/deployment1.xml

index 04dd2ebfc26c23fa21659309065e81e44b2698a3..2286d864b9ec2d8b085dd338c4908868a61eb5bc 100644 (file)
--- a/doc/msg-tuto-src/deployment1.xml
+++ b/doc/msg-tuto-src/deployment1.xml
@@ -1,10 +1,10 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="20"/>       <!-- Number of tasks -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="1000000"/>   <!-- Communication size of tasks -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/doc/msg-tuto-src/deployment2.xml b/doc/msg-tuto-src/deployment2.xml

index de5170efebd6aab51617e2342253cef4359b59fb..99a9fcad838ace6dcf8734027cfa552ea20f23de 100644 (file)
--- a/doc/msg-tuto-src/deployment2.xml
+++ b/doc/msg-tuto-src/deployment2.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master">
+<platform version="4.1">
+  <actor host="Tremblay" function="master">
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="1000000"/>   <!-- Communication size of tasks -->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="1000000"/>   <!-- Communication size of tasks -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/doc/msg-tuto-src/deployment3.xml b/doc/msg-tuto-src/deployment3.xml

index 3c86f5bcbfac724c5aef4d9265f176c168a01924..c602a27cf0dc37d8a281b340b40cd95bb9b73faa 100644 (file)
--- a/doc/msg-tuto-src/deployment3.xml
+++ b/doc/msg-tuto-src/deployment3.xml
@@ -1,19 +1,19 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master">
+<platform version="4.1">
+  <actor host="Tremblay" function="master">
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
-  </process>
-  <process host="Fafard" function="master">
+  </actor>
+  <actor host="Fafard" function="master">
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
-  </process>
-  <process host="Jupiter" function="master">
+  </actor>
+  <actor host="Jupiter" function="master">
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="10"/>   <!-- Communication size of tasks -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/doc/msg-tuto-src/deployment_general.xml b/doc/msg-tuto-src/deployment_general.xml

index 6afc3c89e658f925dcddd37bed21bb2c8a902a5b..adbb7cb3e56fa8eaf872b929800262d4aafa4a5b 100644 (file)
--- a/doc/msg-tuto-src/deployment_general.xml
+++ b/doc/msg-tuto-src/deployment_general.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="griffon-1.nancy.grid5000.fr" function="master"> <!-- griffon-1.nancy.grid5000.fr peer-0 cb1-1.dc1.acloud.com-->
+<platform version="4.1">
+  <actor host="griffon-1.nancy.grid5000.fr" function="master"> <!-- griffon-1.nancy.grid5000.fr peer-0 cb1-1.dc1.acloud.com-->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="100000"/>   <!-- Communication size of tasks -->
       <argument value="3600"/>      <!-- Simulation timeout -->
       <argument value="50000000"/>  <!-- Computation size of tasks -->
       <argument value="100000"/>   <!-- Communication size of tasks -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/app/bittorrent/bittorrent.xml b/examples/java/app/bittorrent/bittorrent.xml

index e65416f3f010046db4684d808923d68e743fad44..df70dfb4292ed153aa9b4980e4b1cc824f18b066 100644 (file)
--- a/examples/java/app/bittorrent/bittorrent.xml
+++ b/examples/java/app/bittorrent/bittorrent.xml
@@ -1,39 +1,39 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  
  
-  <process host="node-0.acme.org" function="app.bittorrent.Tracker">
+  <actor host="node-0.acme.org" function="app.bittorrent.Tracker">
      <argument value="3000" />
      <argument value="3000" />
-  </process>
+  </actor>
  
  
-  <process host="node-1.acme.org" function="app.bittorrent.Peer">
+  <actor host="node-1.acme.org" function="app.bittorrent.Peer">
      <argument value="00000002"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the app.bittorrent.Peer is a seed at the beginning of the simulation --> 
      <argument value="00000002"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the app.bittorrent.Peer is a seed at the beginning of the simulation --> 
-  </process>
-  <process host="node-2.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-2.acme.org" function="app.bittorrent.Peer">
      <argument value="00000003"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000003"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-3.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-3.acme.org" function="app.bittorrent.Peer">
      <argument value="00000004"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000004"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-4.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-4.acme.org" function="app.bittorrent.Peer">
      <argument value="00000005"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the app.bittorrent.Peer is a seed at the beginning of the simulation --> 
      <argument value="00000005"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the app.bittorrent.Peer is a seed at the beginning of the simulation --> 
-  </process>
-  <process host="node-5.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-5.acme.org" function="app.bittorrent.Peer">
      <argument value="00000006"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000006"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-6.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-6.acme.org" function="app.bittorrent.Peer">
      <argument value="00000007"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000007"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-7.acme.org" function="app.bittorrent.Peer">
+  </actor>
+  <actor host="node-7.acme.org" function="app.bittorrent.Peer">
      <argument value="00000008"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000008"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/app/centralizedmutex/centralizedmutex.xml b/examples/java/app/centralizedmutex/centralizedmutex.xml

index 4d4bcb8e9dd15d06a8a76664d2584b10d5458efd..da816b50596c4a930fffce65562b11eec80b18d9 100644 (file)
--- a/examples/java/app/centralizedmutex/centralizedmutex.xml
+++ b/examples/java/app/centralizedmutex/centralizedmutex.xml
@@ -1,15 +1,15 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="app.centralizedmutex.Coordinator">
+<platform version="4.1">
+  <actor host="Tremblay" function="app.centralizedmutex.Coordinator">
      <argument value="2"/> <!-- Amount of CS to serve -->
      <argument value="2"/> <!-- Amount of CS to serve -->
-  </process>
-  <process host="Jupiter" function="app.centralizedmutex.Node">
+  </actor>
+  <actor host="Jupiter" function="app.centralizedmutex.Node">
      <argument value="2"/> <!-- initial sleep time -->
      <argument value="5"/> <!-- CS time -->
      <argument value="2"/> <!-- initial sleep time -->
      <argument value="5"/> <!-- CS time -->
-  </process>
-  <process host="Fafard" function="app.centralizedmutex.Node">
+  </actor>
+  <actor host="Fafard" function="app.centralizedmutex.Node">
      <argument value="2"/> <!-- initial sleep time -->
      <argument value="5"/> <!-- CS time -->
      <argument value="2"/> <!-- initial sleep time -->
      <argument value="5"/> <!-- CS time -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/app/masterworker/masterworker.xml b/examples/java/app/masterworker/masterworker.xml

index f632a5da13ab611dc1c38efccf033eee10b5a0c6..0a96f6cd872ad4cc9baa85e3abaa707e65ad8c3d 100644 (file)
--- a/examples/java/app/masterworker/masterworker.xml
+++ b/examples/java/app/masterworker/masterworker.xml
@@ -1,32 +1,32 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Jacquelin" function="app.masterworker.Master">
+<platform version="4.1">
+  <actor 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>
+  </actor>
  
  
-  <process host="Tremblay" function="app.masterworker.Worker">
+  <actor host="Tremblay" function="app.masterworker.Worker">
      <argument value="0"/>  <!-- Input mailbox -->
      <argument value="0"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Fafard" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Fafard" function="app.masterworker.Worker">
      <argument value="1"/>  <!-- Input mailbox -->
      <argument value="1"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Bourassa" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Bourassa" function="app.masterworker.Worker">
      <argument value="2"/>  <!-- Input mailbox -->
      <argument value="2"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Boivin" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Boivin" function="app.masterworker.Worker">
      <argument value="3"/>  <!-- Input mailbox -->
      <argument value="3"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Ginette" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Ginette" function="app.masterworker.Worker">
      <argument value="4"/>  <!-- Input mailbox -->
      <argument value="4"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Jupiter" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Jupiter" function="app.masterworker.Worker">
      <argument value="5"/>  <!-- Input mailbox -->
      <argument value="5"/>  <!-- Input mailbox -->
-  </process>
-  <process host="Jacquelin" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Jacquelin" function="app.masterworker.Worker">
      <argument value="6"/>  <!-- Input mailbox -->
      <argument value="6"/>  <!-- Input mailbox -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/dht/chord/chord.xml b/examples/java/dht/chord/chord.xml

index 39875d483fe6090353b29fab1cc73a03ca24bb6c..2434d41a85d962fb46036dc962a1ae7d65222e14 100644 (file)
--- a/examples/java/dht/chord/chord.xml
+++ b/examples/java/dht/chord/chord.xml
@@ -1,62 +1,62 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="dht.chord.Node">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="dht.chord.Node">
      <argument value="42"/>
      <argument value="6000000"/>
      <argument value="42"/>
      <argument value="6000000"/>
-  </process>
-  <process host="node-1.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-1.acme.org" function="dht.chord.Node">
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="6000000" />
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="6000000" />
-  </process>
-  <process host="node-2.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-2.acme.org" function="dht.chord.Node">
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="6000000" />
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="6000000" />
-  </process>
-  <process host="node-3.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-3.acme.org" function="dht.chord.Node">
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="6000000" />
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="6000000" />
-  </process>
-  <process host="node-4.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-4.acme.org" function="dht.chord.Node">
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="6000000" />
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="6000000" />
-  </process>
-  <process host="node-5.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-5.acme.org" function="dht.chord.Node">
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="50" />
      <argument value="6000000" />
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="50" />
      <argument value="6000000" />
-  </process>
-  <process host="node-6.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-6.acme.org" function="dht.chord.Node">
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="6000000" />
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="6000000" />
-  </process>
-  <process host="node-7.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-7.acme.org" function="dht.chord.Node">
      <argument value="10004760" />
      <argument value="16509405" />
      <argument value="70" />
      <argument value="6000000" />
      <argument value="10004760" />
      <argument value="16509405" />
      <argument value="70" />
      <argument value="6000000" />
-  </process>
-  <process host="node-8.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-8.acme.org" function="dht.chord.Node">
      <argument value="6518808" />
      <argument value="42" />
      <argument value="80" />
      <argument value="6000000" />
      <argument value="6518808" />
      <argument value="42" />
      <argument value="80" />
      <argument value="6000000" />
-  </process>
-  <process host="node-9.acme.org" function="dht.chord.Node">
+  </actor>
+  <actor host="node-9.acme.org" function="dht.chord.Node">
      <argument value="2015253" />
      <argument value="1319738" />
      <argument value="90" />
      <argument value="6000000" />
      <argument value="2015253" />
      <argument value="1319738" />
      <argument value="90" />
      <argument value="6000000" />
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/dht/kademlia/kademlia.xml b/examples/java/dht/kademlia/kademlia.xml

index 2b113e8362090a5f699285467f556f0402c284ad..748558ffd67c352307f9d527ffcf8ca512670d16 100644 (file)
--- a/examples/java/dht/kademlia/kademlia.xml
+++ b/examples/java/dht/kademlia/kademlia.xml
@@ -1,27 +1,27 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  
  
-  <process host="node-0.acme.org" function="dht.kademlia.Node">
+  <actor host="node-0.acme.org" function="dht.kademlia.Node">
      <argument value="0"/>        <!-- my id -->
      <argument value ="900"/>     <!-- deadline -->
      <argument value="0"/>        <!-- my id -->
      <argument value ="900"/>     <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-1.acme.org" function="dht.kademlia.Node">
+  <actor host="node-1.acme.org" function="dht.kademlia.Node">
      <argument value="1"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
      <argument value="1"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-2.acme.org" function="dht.kademlia.Node">
+  <actor host="node-2.acme.org" function="dht.kademlia.Node">
      <argument value="2"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
      <argument value="2"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-3.acme.org" function="dht.kademlia.Node">
+  <actor host="node-3.acme.org" function="dht.kademlia.Node">
      <argument value="4"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
      <argument value="4"/>        <!-- my id -->
      <argument value="0"/>        <!-- known id -->
      <argument value ="900"/>     <!-- deadline -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml

index 638968651d830d0cef44ab1e0e375a3891b65815..0310fc02e3de9e503f40f41ad33efd9fff6b6c6d 100644 (file)
--- a/examples/java/process/startkilltime/startkilltime.xml
+++ b/examples/java/process/startkilltime/startkilltime.xml
@@ -1,22 +1,22 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="actor.startkilltime.Sleeper" start_time="0" kill_time="5">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-1.acme.org" function="process.startkilltime.Sleeper" start_time="1" kill_time="6">
+  </actor>
+  <actor host="node-1.acme.org" function="actor.startkilltime.Sleeper" start_time="1" kill_time="6">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-2.acme.org" function="process.startkilltime.Sleeper" start_time="2" kill_time="7">
+  </actor>
+  <actor host="node-2.acme.org" function="actor.startkilltime.Sleeper" start_time="2" kill_time="7">
      <argument value="4" />
      <argument value="4" />
-  </process>
-  <process host="node-3.acme.org" function="process.startkilltime.Sleeper" start_time="3" kill_time="8">
+  </actor>
+  <actor host="node-3.acme.org" function="actor.startkilltime.Sleeper" start_time="3" kill_time="8">
      <argument value="4" />
      <argument value="4" />
-  </process>
-  <process host="node-4.acme.org" function="process.startkilltime.Sleeper" start_time="4" kill_time="9">
+  </actor>
+  <actor host="node-4.acme.org" function="actor.startkilltime.Sleeper" start_time="4" kill_time="9">
      <argument value="5" />
      <argument value="5" />
-  </process>
-  <process host="node-5.acme.org" function="process.startkilltime.Sleeper" start_time="5" kill_time="10">
+  </actor>
+  <actor host="node-5.acme.org" function="actor.startkilltime.Sleeper" start_time="5" kill_time="10">
      <argument value="5"/>
      <argument value="5"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/java/task/priority/priority.xml b/examples/java/task/priority/priority.xml

index 92a83dae5f81a249f456be0998456430e79672de..26b16414b70b4f3ade7440ad69a47448369037bd 100644 (file)
--- a/examples/java/task/priority/priority.xml
+++ b/examples/java/task/priority/priority.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Fafard" function="task.priority.Test">
+<platform version="4.1">
+  <actor host="Fafard" function="task.priority.Test">
      <argument value="76296000"/>
      <argument value="1.0"/>
      <argument value="76296000"/>
      <argument value="1.0"/>
-  </process>
-  <process host="Fafard" function="task.priority.Test">
+  </actor>
+  <actor host="Fafard" function="task.priority.Test">
      <argument value="76296000"/>
      <argument value="2.0"/>
      <argument value="76296000"/>
      <argument value="2.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/actions-comm/actions-comm_d.xml b/examples/msg/actions-comm/actions-comm_d.xml

index 8a5602edf728e375e74e096261f4c675b4a600f9..dbecc0b978427a587a0878d59776dec65f4bd63e 100644 (file)
--- a/examples/msg/actions-comm/actions-comm_d.xml
+++ b/examples/msg/actions-comm/actions-comm_d.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="p0"/>
-  <process host="Ruby" function="p1"/>
-  <process host="Perl" function="p2"/>
+<platform version="4.1">
+  <actor host="Tremblay" function="p0"/>
+  <actor host="Ruby" function="p1"/>
+  <actor host="Perl" function="p2"/>
  </platform>
  </platform>
diff --git a/examples/msg/actions-comm/actions-comm_split_d.xml b/examples/msg/actions-comm/actions-comm_split_d.xml

index 846270df05a27cc092bc44f04c53803535fb3c27..831c9e0cacf0aad3711fa2c7b1ad9be27de70c2f 100644 (file)
--- a/examples/msg/actions-comm/actions-comm_split_d.xml
+++ b/examples/msg/actions-comm/actions-comm_split_d.xml
@@ -1,14 +1,14 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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.
+<platform version="4.1">
+<!-- Example file of how to use trace replay, with actions split in separate files, one per actor.
       Launch it like this:
           ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
  
       Launch it like this:
           ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
  
-  <process host="Tremblay" function="p0">
+  <actor host="Tremblay" function="p0">
      <argument value="actions-comm_split_p0.txt"/>
      <argument value="actions-comm_split_p0.txt"/>
-  </process>
-  <process host="Ruby"   function="p1">
+  </actor>
+  <actor host="Ruby"   function="p1">
      <argument value="actions-comm_split_p1.txt"/>
      <argument value="actions-comm_split_p1.txt"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/actions-storage/actions-storage_d.xml b/examples/msg/actions-storage/actions-storage_d.xml

index d2eb6821bc3b415a1672830598ffad39d456bc29..3f52ae60c10c9ff5d43f771428e400b9cf4bcd25 100644 (file)
--- a/examples/msg/actions-storage/actions-storage_d.xml
+++ b/examples/msg/actions-storage/actions-storage_d.xml
@@ -1,5 +1,5 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="denise" function="p0"/>
+<platform version="4.1">
+  <actor host="denise" function="p0"/>
  </platform>
  </platform>
diff --git a/examples/msg/app-bittorrent/app-bittorrent_d.xml b/examples/msg/app-bittorrent/app-bittorrent_d.xml

index 3836bde1104bcc5b1a38cbf9f0e3377403c753b8..5460ab1a9dbd6335763c094f1098f85b1f88d8f3 100644 (file)
--- a/examples/msg/app-bittorrent/app-bittorrent_d.xml
+++ b/examples/msg/app-bittorrent/app-bittorrent_d.xml
@@ -1,39 +1,39 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  
  
-  <process host="node-0.acme.org" function="tracker">
+  <actor host="node-0.acme.org" function="tracker">
      <argument value="3000" />
      <argument value="3000" />
-  </process>
+  </actor>
  
  
-  <process host="node-1.acme.org" function="peer">
+  <actor host="node-1.acme.org" function="peer">
      <argument value="00000002"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the peer is a seed at the beginning of the simulation --> 
      <argument value="00000002"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the peer is a seed at the beginning of the simulation --> 
-  </process>
-  <process host="node-2.acme.org" function="peer">
+  </actor>
+  <actor host="node-2.acme.org" function="peer">
      <argument value="00000003"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000003"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-3.acme.org" function="peer">
+  </actor>
+  <actor host="node-3.acme.org" function="peer">
      <argument value="00000004"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000004"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-4.acme.org" function="peer">
+  </actor>
+  <actor host="node-4.acme.org" function="peer">
      <argument value="00000005"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the peer is a seed at the beginning of the simulation --> 
      <argument value="00000005"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="1" />       <!-- indicates if the peer is a seed at the beginning of the simulation --> 
-  </process>
-  <process host="node-5.acme.org" function="peer">
+  </actor>
+  <actor host="node-5.acme.org" function="peer">
      <argument value="00000006"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000006"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-6.acme.org" function="peer">
+  </actor>
+  <actor host="node-6.acme.org" function="peer">
      <argument value="00000007"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000007"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
-  <process host="node-7.acme.org" function="peer">
+  </actor>
+  <actor host="node-7.acme.org" function="peer">
      <argument value="00000008"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
      <argument value="00000008"/>    <!-- my id -->
      <argument value="5000" />    <!-- end time --> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/app-chainsend/app-chainsend_d.xml b/examples/msg/app-chainsend/app-chainsend_d.xml

index dd83afe6820f583397ba6b1423b673c2fe60968e..73ab26bbd26d13a85933208746e70bda338cc5dc 100644 (file)
--- a/examples/msg/app-chainsend/app-chainsend_d.xml
+++ b/examples/msg/app-chainsend/app-chainsend_d.xml
@@ -1,36 +1,36 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- For using with chainsend -->
    <!-- Broadcaster -->
    <!-- For using with chainsend -->
    <!-- Broadcaster -->
-  <process host="node-0.acme.org" function="broadcaster">
+  <actor host="node-0.acme.org" function="broadcaster">
      <argument value="8"/> <!-- number of peers -->
      <argument value="256"/> <!-- number of pieces -->
      <argument value="8"/> <!-- number of peers -->
      <argument value="256"/> <!-- number of pieces -->
-  </process>
+  </actor>
  
    <!-- Peers -->
  
    <!-- Peers -->
-  <process host="node-1.acme.org" function="peer">
+  <actor host="node-1.acme.org" function="peer">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="node-2.acme.org" function="peer">
+  </actor>
+  <actor host="node-2.acme.org" function="peer">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="node-3.acme.org" function="peer">
+  </actor>
+  <actor host="node-3.acme.org" function="peer">
      <argument value="3"/>
      <argument value="3"/>
-  </process>
-  <process host="node-4.acme.org" function="peer">
+  </actor>
+  <actor host="node-4.acme.org" function="peer">
      <argument value="4"/>
      <argument value="4"/>
-  </process>
-  <process host="node-5.acme.org" function="peer">
+  </actor>
+  <actor host="node-5.acme.org" function="peer">
      <argument value="5"/>
      <argument value="5"/>
-  </process>
-  <process host="node-6.acme.org" function="peer">
+  </actor>
+  <actor host="node-6.acme.org" function="peer">
      <argument value="6"/>
      <argument value="6"/>
-  </process>
-  <process host="node-7.acme.org" function="peer">
+  </actor>
+  <actor host="node-7.acme.org" function="peer">
      <argument value="7"/>
      <argument value="7"/>
-  </process>
-  <process host="node-8.acme.org" function="peer">
+  </actor>
+  <actor host="node-8.acme.org" function="peer">
      <argument value="8"/>
      <argument value="8"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml

index e8ce4f9a2681c92f6f981112935b2ec92fd68067..cf8c0eb226f3e60ab5188fac5e4b33987da989e8 100644 (file)
--- a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml
+++ b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml
@@ -1,30 +1,30 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="6"/>         <!-- Number of workers -->
      <argument value="20"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="6"/>         <!-- Number of workers -->
-  </process>
+  </actor>
    <!-- The worker processes (with mailbox to listen on as argument) -->
    <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="worker">
+  <actor host="Tremblay" function="worker">
      <argument value="0"/> 
      <argument value="0"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
      <argument value="1"/> 
      <argument value="1"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
      <argument value="2"/> 
      <argument value="2"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
      <argument value="3"/> 
      <argument value="3"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
      <argument value="4"/> 
      <argument value="4"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
      <argument value="5"/> 
      <argument value="5"/> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml

index 11d28ff11f3c054350a1bf46f9bece820a096268..cd7a4f444af01b223c784c33e70fc283b93360a1 100644 (file)
--- a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml
+++ b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml
@@ -1,57 +1,57 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) --> 
+  <actor host="100030591" function="master">
      <argument value="10"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="15"/>         <!-- Number of workers -->
      <argument value="10"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="15"/>         <!-- Number of workers -->
-  </process>
+  </actor>
    <!-- The worker processes (with mailbox to listen on as argument) -->
    <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="100036570" function="worker">
+  <actor host="100036570" function="worker">
      <argument value="0"/> 
      <argument value="0"/> 
-  </process>
-  <process host="100041334" function="worker">
+  </actor>
+  <actor host="100041334" function="worker">
      <argument value="1"/> 
      <argument value="1"/> 
-  </process>
-  <process host="100055671" function="worker">
+  </actor>
+  <actor host="100055671" function="worker">
      <argument value="2"/> 
      <argument value="2"/> 
-  </process>
-  <process host="100066658" function="worker">
+  </actor>
+  <actor host="100066658" function="worker">
      <argument value="3"/> 
      <argument value="3"/> 
-  </process>
-  <process host="100090691" function="worker">
+  </actor>
+  <actor host="100090691" function="worker">
      <argument value="4"/> 
      <argument value="4"/> 
-  </process>
-  <process host="100094952" function="worker">
+  </actor>
+  <actor host="100094952" function="worker">
      <argument value="5"/> 
      <argument value="5"/> 
-  </process>
-  <process host="100117943" function="worker">
+  </actor>
+  <actor host="100117943" function="worker">
      <argument value="6"/> 
      <argument value="6"/> 
-  </process>
-  <process host="100126290" function="worker">
+  </actor>
+  <actor host="100126290" function="worker">
      <argument value="7"/> 
      <argument value="7"/> 
-  </process>
-  <process host="100144483" function="worker">
+  </actor>
+  <actor host="100144483" function="worker">
      <argument value="8"/> 
      <argument value="8"/> 
-  </process>
-  <process host="100152889" function="worker">
+  </actor>
+  <actor host="100152889" function="worker">
      <argument value="9"/> 
      <argument value="9"/> 
-  </process>
-  <process host="100178474" function="worker">
+  </actor>
+  <actor host="100178474" function="worker">
      <argument value="10"/> 
      <argument value="10"/> 
-  </process>
-  <process host="100180261" function="worker">
+  </actor>
+  <actor host="100180261" function="worker">
      <argument value="11"/> 
      <argument value="11"/> 
-  </process>
-  <process host="100185883" function="worker">
+  </actor>
+  <actor host="100185883" function="worker">
      <argument value="12"/> 
      <argument value="12"/> 
-  </process>
-  <process host="100186365" function="worker">
+  </actor>
+  <actor host="100186365" function="worker">
      <argument value="13"/> 
      <argument value="13"/> 
-  </process>
-  <process host="100200866" function="worker">
+  </actor>
+  <actor host="100200866" function="worker">
      <argument value="14"/> 
      <argument value="14"/> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/app-masterworker/app-masterworker_d.xml b/examples/msg/app-masterworker/app-masterworker_d.xml

index 869db931523ab1f3685e44fbd1132febef21d8c6..feadead6cd1fe0078ebc29a4eaae9d646474845b 100644 (file)
--- a/examples/msg/app-masterworker/app-masterworker_d.xml
+++ b/examples/msg/app-masterworker/app-masterworker_d.xml
@@ -1,27 +1,27 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="5"/>         <!-- Number of workers -->
      <argument value="20"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="5"/>         <!-- Number of workers -->
-  </process>
+  </actor>
    <!-- The worker processes (with mailbox to listen on as argument) -->
    <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="worker" on_failure="RESTART">
+  <actor host="Tremblay" function="worker" on_failure="RESTART">
      <argument value="0"/> 
      <argument value="0"/> 
-  </process>
-  <process host="Jupiter" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Jupiter" function="worker" on_failure="RESTART">
      <argument value="1"/> 
      <argument value="1"/> 
-  </process>
-  <process host="Fafard" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Fafard" function="worker" on_failure="RESTART">
      <argument value="2"/> 
      <argument value="2"/> 
-  </process>
-  <process host="Ginette" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Ginette" function="worker" on_failure="RESTART">
      <argument value="3"/> 
      <argument value="3"/> 
-  </process>
-  <process host="Bourassa" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Bourassa" function="worker" on_failure="RESTART">
      <argument value="4"/> 
      <argument value="4"/> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/app-pingpong/app-pingpong_d.xml b/examples/msg/app-pingpong/app-pingpong_d.xml

index af7b1e32749b9ffccd9ab7db80010e7a397a2a85..c0fdc23b7d8d5ba89e58cec1bf86dde22eb2a17a 100644 (file)
--- a/examples/msg/app-pingpong/app-pingpong_d.xml
+++ b/examples/msg/app-pingpong/app-pingpong_d.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  <!-- For using with ping_pong, platform_sendrecv.xml -->
  <!-- For using with ping_pong, platform_sendrecv.xml -->
-  <process host="Tremblay" function="pinger">
+  <actor host="Tremblay" function="pinger">
      <argument value="Jupiter"/>
      <argument value="Jupiter"/>
-  </process>
-  <process host="Jupiter"  function="ponger">
+  </actor>
+  <actor host="Jupiter"  function="ponger">
      <argument value="Tremblay"/>
      <argument value="Tremblay"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-wait/async-wait2_d.xml b/examples/msg/async-wait/async-wait2_d.xml

index 6e731068cddfc8bc85071088025b704b98880b65..1e49112af97a1cc64511d969a5ad1ddd9d9146bd 100644 (file)
--- a/examples/msg/async-wait/async-wait2_d.xml
+++ b/examples/msg/async-wait/async-wait2_d.xml
@@ -1,19 +1,19 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
      <argument value="0"/>
      <argument value="5"/>         <!-- Sleep_start_time -->
      <argument value="0.1"/>      <!-- Time for test -->
      <argument value="0"/>
      <argument value="5"/>         <!-- Sleep_start_time -->
      <argument value="0.1"/>      <!-- Time for test -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-wait/async-wait3_d.xml b/examples/msg/async-wait/async-wait3_d.xml

index 27c1d209fb34dff39f927f3147d685330522ed01..f1ef12d94e5b85e3b8d77e5a868e929f8f55ad5a 100644 (file)
--- a/examples/msg/async-wait/async-wait3_d.xml
+++ b/examples/msg/async-wait/async-wait3_d.xml
@@ -1,19 +1,19 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
      <argument value="0"/>
      <argument value="1"/>         <!-- Sleep_start_time -->
      <argument value="0"/>      <!-- Time for test -->
      <argument value="0"/>
      <argument value="1"/>         <!-- Sleep_start_time -->
      <argument value="0"/>      <!-- Time for test -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-wait/async-wait4_d.xml b/examples/msg/async-wait/async-wait4_d.xml

index 939d62e426f6455e0048d6992387484449fdd4e9..84ca7e6a153fa57cd7d2a1bb064890e4fe1ffa6f 100644 (file)
--- a/examples/msg/async-wait/async-wait4_d.xml
+++ b/examples/msg/async-wait/async-wait4_d.xml
@@ -1,20 +1,20 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
      <argument value="0"/>
      <argument value="5"/>         <!-- Sleep_start_time -->
      <argument value="0"/>      <!-- Time for test -->
      <argument value="0"/>
      <argument value="5"/>         <!-- Sleep_start_time -->
      <argument value="0"/>      <!-- Time for test -->
-  </process>
+  </actor>
  </platform>
  
  </platform>
  
diff --git a/examples/msg/async-wait/async-wait_d.xml b/examples/msg/async-wait/async-wait_d.xml

index f72618e9ce5a8b7623ebc209ee9385d37536a6f4..e38557201915d2451b61c08381fdea7693785c15 100644 (file)
--- a/examples/msg/async-wait/async-wait_d.xml
+++ b/examples/msg/async-wait/async-wait_d.xml
@@ -1,19 +1,19 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
      <argument value="0"/>
      <argument value="1"/>         <!-- Sleep_start_time -->
      <argument value="0.1"/>      <!-- Time for test -->
      <argument value="0"/>
      <argument value="1"/>         <!-- Sleep_start_time -->
      <argument value="0.1"/>      <!-- Time for test -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-waitall/async-waitall_d.xml b/examples/msg/async-waitall/async-waitall_d.xml

index 51f03d159062be8a404f6558df644e3079a57650..6f122c2988d16eba4ac4f9baba5d592fb17b1604 100644 (file)
--- a/examples/msg/async-waitall/async-waitall_d.xml
+++ b/examples/msg/async-waitall/async-waitall_d.xml
@@ -1,15 +1,15 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="3"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="1"/>         <!-- Number of receivers -->
-  </process>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-waitany/async-waitany_d.xml b/examples/msg/async-waitany/async-waitany_d.xml

index 1972e413cfef0d90c4b1a74a4c83c820a3f463ed..2e680c4c3fa49faf794174579bf1ca46226e73ad 100644 (file)
--- a/examples/msg/async-waitany/async-waitany_d.xml
+++ b/examples/msg/async-waitany/async-waitany_d.xml
@@ -1,21 +1,21 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="sender">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The receiver processes -->
    <!-- The receiver processes -->
-  <process host="Fafard" function="receiver">
+  <actor host="Fafard" function="receiver">
      <argument value="0"/>
      <argument value="3"/>       <!-- Number of tasks -->
      <argument value="0"/>
      <argument value="3"/>       <!-- Number of tasks -->
-  </process>
-  <process host="Jupiter" function="receiver">
+  </actor>
+  <actor host="Jupiter" function="receiver">
      <argument value="1"/>
      <argument value="3"/>       <!-- Number of tasks -->
      <argument value="1"/>
      <argument value="3"/>       <!-- Number of tasks -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/async-yield/async-yield_d.xml b/examples/msg/async-yield/async-yield_d.xml

index 0b1b17a4f4cb7f4438ccff5b8d84e0c1a41353d8..b1ab776f577f4c30fb997d30850ee67f7b8dc291 100644 (file)
--- a/examples/msg/async-yield/async-yield_d.xml
+++ b/examples/msg/async-yield/async-yield_d.xml
@@ -1,10 +1,10 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="yielder">
+<platform version="4.1">
+  <actor host="Tremblay" function="yielder">
      <argument value="10"/>       <!-- Number of yields to do  -->
      <argument value="10"/>       <!-- Number of yields to do  -->
-  </process>
-  <process host="Ruby" function="yielder">
+  </actor>
+  <actor host="Ruby" function="yielder">
      <argument value="15"/>       <!-- Number of yields to do  -->
      <argument value="15"/>       <!-- Number of yields to do  -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/dht-chord/dht-chord_d.xml b/examples/msg/dht-chord/dht-chord_d.xml

index f31fb7bc465df9368d1e19e6a7708e4b78412702..b698648349c48eb919f5e02b954d47d622ee34e9 100644 (file)
--- a/examples/msg/dht-chord/dht-chord_d.xml
+++ b/examples/msg/dht-chord/dht-chord_d.xml
@@ -1,62 +1,62 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="node">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="node">
      <argument value="42"/>
      <argument value="6000000"/>
      <argument value="42"/>
      <argument value="6000000"/>
-  </process>
-  <process host="node-1.acme.org" function="node">
+  </actor>
+  <actor host="node-1.acme.org" function="node">
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="6000000" />
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="6000000" />
-  </process>
-  <process host="node-2.acme.org" function="node">
+  </actor>
+  <actor host="node-2.acme.org" function="node">
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="6000000" />
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="6000000" />
-  </process>
-  <process host="node-3.acme.org" function="node">
+  </actor>
+  <actor host="node-3.acme.org" function="node">
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="6000000" />
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="6000000" />
-  </process>
-  <process host="node-4.acme.org" function="node">
+  </actor>
+  <actor host="node-4.acme.org" function="node">
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="6000000" />
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="6000000" />
-  </process>
-  <process host="node-5.acme.org" function="node">
+  </actor>
+  <actor host="node-5.acme.org" function="node">
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="50" />
      <argument value="6000000" />
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="50" />
      <argument value="6000000" />
-  </process>
-  <process host="node-6.acme.org" function="node">
+  </actor>
+  <actor host="node-6.acme.org" function="node">
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="6000000" />
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="6000000" />
-  </process>
-  <process host="node-7.acme.org" function="node">
+  </actor>
+  <actor host="node-7.acme.org" function="node">
      <argument value="10004760" />
      <argument value="16509405" />
      <argument value="70" />
      <argument value="6000000" />
      <argument value="10004760" />
      <argument value="16509405" />
      <argument value="70" />
      <argument value="6000000" />
-  </process>
-  <process host="node-8.acme.org" function="node">
+  </actor>
+  <actor host="node-8.acme.org" function="node">
      <argument value="6518808" />
      <argument value="42" />
      <argument value="80" />
      <argument value="6000000" />
      <argument value="6518808" />
      <argument value="42" />
      <argument value="80" />
      <argument value="6000000" />
-  </process>
-  <process host="node-9.acme.org" function="node">
+  </actor>
+  <actor host="node-9.acme.org" function="node">
      <argument value="2015253" />
      <argument value="1319738" />
      <argument value="90" />
      <argument value="6000000" />
      <argument value="2015253" />
      <argument value="1319738" />
      <argument value="90" />
      <argument value="6000000" />
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml

index a63e6c9af63099988d5cb9b980c2f2985b75de09..e199776298ae5f7181a7237c3dd61d65dfbaa628 100644 (file)
--- a/examples/msg/dht-kademlia/dht-kademlia_d.xml
+++ b/examples/msg/dht-kademlia/dht-kademlia_d.xml
@@ -1,72 +1,72 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  
  
-  <process host="node-0.acme.org" function="node">
+  <actor host="node-0.acme.org" function="node">
      <argument value="0x0000"/>          <!-- my id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x0000"/>          <!-- my id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-1.acme.org" function="node">
+  <actor host="node-1.acme.org" function="node">
      <argument value="0x0001"/>          <!-- my id -->
      <argument value="0"/>               <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x0001"/>          <!-- my id -->
      <argument value="0"/>               <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-2.acme.org" function="node">
+  <actor host="node-2.acme.org" function="node">
      <argument value="0x0003"/>          <!-- my id -->
      <argument value="0x0001"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x0003"/>          <!-- my id -->
      <argument value="0x0001"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
+  </actor>
  
  
-  <process host="node-3.acme.org" function="node">
+  <actor host="node-3.acme.org" function="node">
      <argument value="0x0007"/>          <!-- my id -->
      <argument value="0x0003"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x0007"/>          <!-- my id -->
      <argument value="0x0003"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-4.acme.org" function="node">
+  </actor>
+  <actor host="node-4.acme.org" function="node">
      <argument value="0x000f"/>          <!-- my id -->
      <argument value="0x0007"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x000f"/>          <!-- my id -->
      <argument value="0x0007"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-5.acme.org" function="node">
+  </actor>
+  <actor host="node-5.acme.org" function="node">
      <argument value="0x001f"/>          <!-- my id -->
      <argument value="0x000f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x001f"/>          <!-- my id -->
      <argument value="0x000f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-6.acme.org" function="node">
+  </actor>
+  <actor host="node-6.acme.org" function="node">
      <argument value="0x003f"/>          <!-- my id -->
      <argument value="0x001f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x003f"/>          <!-- my id -->
      <argument value="0x001f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-7.acme.org" function="node">
+  </actor>
+  <actor host="node-7.acme.org" function="node">
      <argument value="0x007f"/>          <!-- my id -->
      <argument value="0x003f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x007f"/>          <!-- my id -->
      <argument value="0x003f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-8.acme.org" function="node">
+  </actor>
+  <actor host="node-8.acme.org" function="node">
      <argument value="0x00ff"/>          <!-- my id -->
      <argument value="0x007f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x00ff"/>          <!-- my id -->
      <argument value="0x007f"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-9.acme.org" function="node">
+  </actor>
+  <actor host="node-9.acme.org" function="node">
      <argument value="0x01ff"/>          <!-- my id -->
      <argument value="0x00ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x01ff"/>          <!-- my id -->
      <argument value="0x00ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-10.acme.org" function="node">
+  </actor>
+  <actor host="node-10.acme.org" function="node">
      <argument value="0x03ff"/>          <!-- my id -->
      <argument value="0x01ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x03ff"/>          <!-- my id -->
      <argument value="0x01ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-11.acme.org" function="node">
+  </actor>
+  <actor host="node-11.acme.org" function="node">
      <argument value="0x07ff"/>          <!-- my id -->
      <argument value="0x03ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x07ff"/>          <!-- my id -->
      <argument value="0x03ff"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
-  <process host="node-12.acme.org" function="node">
+  </actor>
+  <actor host="node-12.acme.org" function="node">
      <argument value="0x0fff"/>          <!-- my id -->
      <argument value="0x0000"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
      <argument value="0x0fff"/>          <!-- my id -->
      <argument value="0x0000"/>          <!-- known id -->
      <argument value ="780"/>            <!-- deadline -->
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/energy-onoff/platform_onoff.xml b/examples/msg/energy-onoff/platform_onoff.xml

index 58be9ca6fd5d39b1546faf2618819dce947dfafa..b0423a987a6cc2492a5bfe0f0fb0aca243d2e8b6 100644 (file)
--- a/examples/msg/energy-onoff/platform_onoff.xml
+++ b/examples/msg/energy-onoff/platform_onoff.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  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 -->
  
@@ -40,5 +40,5 @@
      <route src="MyHost1" dst="MyHost2">
        <link_ctn id="link1"/>
      </route>
      <route src="MyHost1" dst="MyHost2">
        <link_ctn id="link1"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/msg/io-remote/io-remote_d.xml b/examples/msg/io-remote/io-remote_d.xml

index 0bda8f8e3079c0ec5546b737a78dd04198a31ff4..838ab3d3ea7391265d5cc560540f75046abd0e1c 100644 (file)
--- a/examples/msg/io-remote/io-remote_d.xml
+++ b/examples/msg/io-remote/io-remote_d.xml
@@ -1,24 +1,24 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="alice" function="host">
+<platform version="4.1">
+  <actor host="alice" function="host">
      <argument value = "c:\Windows\setupact.log"/>
      <argument value = "c:\Windows\setupact.log"/>
-  </process>
-  <process host="bob" function="host">
+  </actor>
+  <actor host="bob" function="host">
      <argument value = "/scratch/lib/libsimgrid.so.3.6.2"/>
      <argument value = "/scratch/doc/simgrid/examples/platforms/g5k.xml"/>
      <argument value = "alice"/>
      <argument value = "c:\Windows\Platforms\g5k.xml"/>
      <argument value = "0"/>
      <argument value = "/scratch/lib/libsimgrid.so.3.6.2"/>
      <argument value = "/scratch/doc/simgrid/examples/platforms/g5k.xml"/>
      <argument value = "alice"/>
      <argument value = "c:\Windows\Platforms\g5k.xml"/>
      <argument value = "0"/>
-  </process>
-  <process host="carl" function="host">
+  </actor>
+  <actor host="carl" function="host">
      <argument value = "/scratch/lib/libsimgrid.so.3.6.2"/>
      <argument value = "/scratch/lib/libsimgrid.so.3.6.2"/>
-  </process>
-  <process host="dave" function="host">
+  </actor>
+  <actor host="dave" function="host">
      <argument value = "c:\Windows\bootstat.dat"/>
      <argument value = "c:\Windows\Professional.xml"/>
      <argument value = "carl"/>
      <argument value = "/scratch/mailbox/Professional.xml"/>
      <argument value = "1"/>
      <argument value = "c:\Windows\bootstat.dat"/>
      <argument value = "c:\Windows\Professional.xml"/>
      <argument value = "carl"/>
      <argument value = "/scratch/mailbox/Professional.xml"/>
      <argument value = "1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged1.xml b/examples/msg/mc/deploy_bugged1.xml

index 4333fd73a9df76a0b1caf67d300cbd0f1803c601..1f4b2a7c4b666918fe46298f9957ab9be9eb7b75 100644 (file)
--- a/examples/msg/mc/deploy_bugged1.xml
+++ b/examples/msg/mc/deploy_bugged1.xml
@@ -1,16 +1,16 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="HostA" function="server">
+<platform version="4.1">
+  <actor host="HostA" function="server">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="HostD" function="client">
+  </actor>
+  <actor host="HostD" function="client">
      <argument value="3"/>
      <argument value="3"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged1_liveness.xml b/examples/msg/mc/deploy_bugged1_liveness.xml

index 08b755e74e8d1fb5831d5f4697439744725c1b3b..3d6b31c5e48b7bef2c9ec20ad607e939308df825 100644 (file)
--- a/examples/msg/mc/deploy_bugged1_liveness.xml
+++ b/examples/msg/mc/deploy_bugged1_liveness.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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" >
+<platform version="4.1">
+  <actor host="Tremblay" function="coordinator" />
+  <actor host="Boivin" function="client" >
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="Fafard" function="client" >
+  </actor>
+  <actor host="Fafard" function="client" >
      <argument value="2"/>
      <argument value="2"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged1_liveness_visited.xml b/examples/msg/mc/deploy_bugged1_liveness_visited.xml

index 911865f386fbdd768a4c39f4551851b9c6a1bbdf..af31561c404a30bd33a1a4c3c9719fe1fd2baa7e 100644 (file)
--- a/examples/msg/mc/deploy_bugged1_liveness_visited.xml
+++ b/examples/msg/mc/deploy_bugged1_liveness_visited.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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" >
+<platform version="4.1">
+  <actor host="Tremblay" function="coordinator" />
+  <actor host="Boivin" function="client" >
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="Fafard" function="client" >
+  </actor>
+  <actor host="Fafard" function="client" >
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged2.xml b/examples/msg/mc/deploy_bugged2.xml

index c6dbe05b90b8325f026ce47d86351647a50c3dad..c95f94bcf74d6ef821f46c4e91b171aa13fd8315 100644 (file)
--- a/examples/msg/mc/deploy_bugged2.xml
+++ b/examples/msg/mc/deploy_bugged2.xml
@@ -1,13 +1,13 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="HostA" function="server">
+<platform version="4.1">
+  <actor host="HostA" function="server">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged2_liveness.xml b/examples/msg/mc/deploy_bugged2_liveness.xml

index 51ea5bf32025bde6dbe5678396a9398d80c9fcbd..e1b845cd3922abfb9e2a1b1385acc29b3159358a 100644 (file)
--- a/examples/msg/mc/deploy_bugged2_liveness.xml
+++ b/examples/msg/mc/deploy_bugged2_liveness.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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" >
+<platform version="4.1">
+  <actor host="Tremblay" function="coordinator" />
+  <actor host="Fafard"   function="client" >
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="Boivin" function="client" >
+  </actor>
+  <actor host="Boivin" function="client" >
      <argument value="2"/>
      <argument value="2"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_bugged3.xml b/examples/msg/mc/deploy_bugged3.xml

index c6dbe05b90b8325f026ce47d86351647a50c3dad..c95f94bcf74d6ef821f46c4e91b171aa13fd8315 100644 (file)
--- a/examples/msg/mc/deploy_bugged3.xml
+++ b/examples/msg/mc/deploy_bugged3.xml
@@ -1,13 +1,13 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="HostA" function="server">
+<platform version="4.1">
+  <actor host="HostA" function="server">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_centralized_mutex.xml b/examples/msg/mc/deploy_centralized_mutex.xml

index a22bda15f1fc50915740a73659604e2b817a0ae3..89ba1a2de350d012f1a43fabf972fe9cf8746e44 100644 (file)
--- a/examples/msg/mc/deploy_centralized_mutex.xml
+++ b/examples/msg/mc/deploy_centralized_mutex.xml
@@ -1,10 +1,10 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="coordinator" />
+<platform version="4.1">
+  <actor host="Tremblay" function="coordinator" />
  
  
-  <process host="Fafard" function="client" />
-  <process host="Boivin" function="client" />
-  <process host="Jacquelin" function="client" />
-  <process host="Ginette" function="client" />
+  <actor host="Fafard" function="client" />
+  <actor host="Boivin" function="client" />
+  <actor host="Jacquelin" function="client" />
+  <actor host="Ginette" function="client" />
  </platform>
  </platform>
diff --git a/examples/msg/mc/deploy_electric_fence.xml b/examples/msg/mc/deploy_electric_fence.xml

index cf7d227d49b2f3c88660690914ec8758759f98d2..1926770de713fe789439617f9b368d892d736629 100644 (file)
--- a/examples/msg/mc/deploy_electric_fence.xml
+++ b/examples/msg/mc/deploy_electric_fence.xml
@@ -1,13 +1,13 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="HostA" function="server">
+<platform version="4.1">
+  <actor host="HostA" function="server">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
      <argument value="1"/>
      <argument value="1"/>
-    </process>
-  <process host="HostC" function="client">
+    </actor>
+  <actor host="HostC" function="client">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml

index 3149f5c4bbbff54b2cebe38498da57a5c2969ea4..29d062c52633eba819b06b864964992aa1ad35ab 100644 (file)
--- a/examples/msg/mc/platform.xml
+++ b/examples/msg/mc/platform.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="HostA" speed="137.333Mf"/>
      <host id="HostB" speed="98.095Mf"/>
      <host id="HostC" speed="98.095Mf"/>
      <host id="HostA" speed="137.333Mf"/>
      <host id="HostB" speed="98.095Mf"/>
      <host id="HostC" speed="98.095Mf"/>
@@ -18,5 +18,5 @@
      <route src="HostA" dst="HostD">
        <link_ctn id="3"/>
      </route>
      <route src="HostA" dst="HostD">
        <link_ctn id="3"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/3hosts_2links_d.xml b/examples/msg/network-ns3/3hosts_2links_d.xml

index a360912ef82f045654649fc7868bb91cda66f54d..1d7171d0690b9dc22232ab10822021861aff3a95 100644 (file)
--- a/examples/msg/network-ns3/3hosts_2links_d.xml
+++ b/examples/msg/network-ns3/3hosts_2links_d.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="Jupiter" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml

index c9727c3a7b1a9b99655c58e61a2806a17d2d053f..cc0e18aa5fd5b8bdb1e0a1c2fd1bf083b64db366 100644 (file)
--- a/examples/msg/network-ns3/3links-timer_d.xml
+++ b/examples/msg/network-ns3/3links-timer_d.xml
@@ -1,44 +1,44 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="Jupiter" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="Fafard" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Ginette" function="worker">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="Bourassa" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Lovelace" function="worker">
      <argument value="3"/>
      <argument value="3"/>
-  </process>
-  <process host="Bourassa" function="master" start_time="2.0">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Lovelace" function="worker">
      <argument value="4"/>
      <argument value="4"/>
-  </process>
-  <process host="Lovelace" function="timer">
+  </actor>
+  <actor host="Lovelace" function="timer">
      <argument value="0"/>
      <argument value=".1"/>
      <argument value="0"/>
      <argument value=".1"/>
-  </process>
-  <process host="Lovelace" function="timer" start_time="2.0">
+  </actor>
+  <actor host="Lovelace" function="timer" start_time="2.0">
      <argument value="0"/>
      <argument value=".1"/>
      <argument value="0"/>
      <argument value=".1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml

index 9ae01af3ea3f763fc21f2271a3d1062ee7c22b5d..2bb2b03c7d6093b000c72b6efd10671bead3c490 100644 (file)
--- a/examples/msg/network-ns3/3links_d.xml
+++ b/examples/msg/network-ns3/3links_d.xml
@@ -1,28 +1,28 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="Jupiter" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="Fafard" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Ginette" function="worker">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="Bourassa" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Lovelace" function="worker">
      <argument value="3"/>
      <argument value="3"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml

index 91ce4790b827a68c08e4949afb606c5a856b14ad..cc69bd78db52a78e269d766ed5ecfc91bd314eed 100644 (file)
--- a/examples/msg/network-ns3/crosstraffic_d.xml
+++ b/examples/msg/network-ns3/crosstraffic_d.xml
@@ -1,36 +1,36 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="S1" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="C1" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
-  <process host="S1" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="C1" function="worker">
      <argument value="2"/>
      <argument value="2"/>
-  </process>
-  <process host="S1" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="C1" function="worker">
      <argument value="3"/>
      <argument value="3"/>
-  </process>
-  <process host="C1" function="master">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="S1" function="worker">
      <argument value="4"/>
      <argument value="4"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml

index cf3068b693f5dcd10408dd73e886e5d91c74ff59..150a99ac0368d033f73bb3befba68983326e33a8 100644 (file)
--- a/examples/msg/network-ns3/dogbone_d.xml
+++ b/examples/msg/network-ns3/dogbone_d.xml
@@ -1,20 +1,20 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="S1" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="C1" function="worker">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="C2" function="worker">
+  </actor>
+  <actor host="C2" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml

index 9eab752e5f108c3924c9caa0202f64e932bafc2f..4c0f7bc333130ded00bc6ca7c1529d3ab88c4643 100644 (file)
--- a/examples/msg/network-ns3/one_cluster_d.xml
+++ b/examples/msg/network-ns3/one_cluster_d.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="node-6.acme.org" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml

index 4bc51076f55fe908009df4721d0fabf217ff636e..2a2d4b299d60b6056dab86995cc5f545d4508539 100644 (file)
--- a/examples/msg/network-ns3/onelink_d.xml
+++ b/examples/msg/network-ns3/onelink_d.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="S1" function="master">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="C1" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/network-ns3/two_clusters_d.xml b/examples/msg/network-ns3/two_clusters_d.xml

index db540cbbf29ef81b44aa190a9c3511af2fc20e06..c104b21a4c6cded53986ba32ff8f59eedd5a0460 100644 (file)
--- a/examples/msg/network-ns3/two_clusters_d.xml
+++ b/examples/msg/network-ns3/two_clusters_d.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="node-16.acme.org" function="worker">
      <argument value="1"/>
      <argument value="1"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/platform-properties/platform-properties_d.xml b/examples/msg/platform-properties/platform-properties_d.xml

index 98d35908b82d04ea5ee8d4a39c106d9c5b7e3be0..f4c76b92a156a21782a25fde7bc7cd68acbfec0e 100644 (file)
--- a/examples/msg/platform-properties/platform-properties_d.xml
+++ b/examples/msg/platform-properties/platform-properties_d.xml
@@ -1,10 +1,10 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="bob">
+<platform version="4.1">
+  <actor host="host1" function="alice" />
+  <actor host="host1" function="bob">
      <prop id="SomeProp" value="SomeValue"/>
      <prop id="SomeProp" value="SomeValue"/>
-  </process>
-  <process host="host2" function="carole" />
-  <process host="host2" function="david" />
+  </actor>
+  <actor host="host2" function="carole" />
+  <actor host="host2" function="david" />
  </platform>
  </platform>
diff --git a/examples/msg/process-startkilltime/baseline_d.xml b/examples/msg/process-startkilltime/baseline_d.xml

index bc19db11952ae06cdb4dd13b5e9b3d9ab425238a..e24ccedf13a53e35dff1bcd6f45729eb794f2648 100644 (file)
--- a/examples/msg/process-startkilltime/baseline_d.xml
+++ b/examples/msg/process-startkilltime/baseline_d.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- Just sleeps for 10 seconds and quits -->
    <!-- Just sleeps for 10 seconds and quits -->
-  <process host="node-0.acme.org" function="sleeper">  
+  <actor host="node-0.acme.org" function="sleeper">  
      <argument value="10"/>
      <argument value="10"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/process-startkilltime/kill_d.xml b/examples/msg/process-startkilltime/kill_d.xml

index a85e3f67a0b19a10d432645cebee67dd594615e7..6d7d312410a2efd8947c65e7fee5e7bfe7c7f24c 100644 (file)
--- a/examples/msg/process-startkilltime/kill_d.xml
+++ b/examples/msg/process-startkilltime/kill_d.xml
@@ -1,13 +1,13 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="node-1.acme.org" function="sleeper" kill_time="6">
+<platform version="4.1">
+  <actor host="node-1.acme.org" function="sleeper" kill_time="6">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-2.acme.org" function="sleeper" kill_time="6">
+  </actor>
+  <actor host="node-2.acme.org" function="sleeper" kill_time="6">
      <argument value="6"/>
      <argument value="6"/>
-  </process>
-  <process host="node-3.acme.org" function="sleeper" kill_time="10"> 
+  </actor>
+  <actor host="node-3.acme.org" function="sleeper" kill_time="10"> 
      <argument value="6"/>
      <argument value="6"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/process-startkilltime/start_d.xml b/examples/msg/process-startkilltime/start_d.xml

index 6819164ed6ffbc0c94b147c104f6e3b52d19d75e..3d6934b178f20266b51650d2989f9ccfb5df0d4d 100644 (file)
--- a/examples/msg/process-startkilltime/start_d.xml
+++ b/examples/msg/process-startkilltime/start_d.xml
@@ -1,22 +1,22 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="sleeper" start_time="0">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="sleeper" start_time="0">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-1.acme.org" function="sleeper" start_time="1">
+  </actor>
+  <actor host="node-1.acme.org" function="sleeper" start_time="1">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-2.acme.org" function="sleeper" start_time="2">
+  </actor>
+  <actor host="node-2.acme.org" function="sleeper" start_time="2">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-3.acme.org" function="sleeper" start_time="3">
+  </actor>
+  <actor host="node-3.acme.org" function="sleeper" start_time="3">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-4.acme.org" function="sleeper" start_time="4">
+  </actor>
+  <actor host="node-4.acme.org" function="sleeper" start_time="4">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-5.acme.org" function="sleeper" start_time="5">
+  </actor>
+  <actor host="node-5.acme.org" function="sleeper" start_time="5">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/process-startkilltime/start_kill_d.xml b/examples/msg/process-startkilltime/start_kill_d.xml

index 318c5fe46af839169eb06ee1b66a114ef04ac888..7292ca2fbb1f9c3a3ad77e50caeb224bfadfd5ae 100644 (file)
--- a/examples/msg/process-startkilltime/start_kill_d.xml
+++ b/examples/msg/process-startkilltime/start_kill_d.xml
@@ -1,22 +1,22 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="sleeper" start_time="0" kill_time="5">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="sleeper" start_time="0" kill_time="5">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-1.acme.org" function="sleeper" start_time="1" kill_time="6">
+  </actor>
+  <actor host="node-1.acme.org" function="sleeper" start_time="1" kill_time="6">
      <argument value="10"/>
      <argument value="10"/>
-  </process>
-  <process host="node-2.acme.org" function="sleeper" start_time="2" kill_time="7">
+  </actor>
+  <actor host="node-2.acme.org" function="sleeper" start_time="2" kill_time="7">
      <argument value="4" />
      <argument value="4" />
-  </process>
-  <process host="node-3.acme.org" function="sleeper" start_time="3" kill_time="8">
+  </actor>
+  <actor host="node-3.acme.org" function="sleeper" start_time="3" kill_time="8">
      <argument value="4" />
      <argument value="4" />
-  </process>
-  <process host="node-4.acme.org" function="sleeper" start_time="4" kill_time="9">
+  </actor>
+  <actor host="node-4.acme.org" function="sleeper" start_time="4" kill_time="9">
      <argument value="5" />
      <argument value="5" />
-  </process>
-  <process host="node-5.acme.org" function="sleeper" start_time="5" kill_time="10">
+  </actor>
+  <actor host="node-5.acme.org" function="sleeper" start_time="5" kill_time="10">
      <argument value="5"/>
      <argument value="5"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/msg/task-priority/task-priority_d.xml b/examples/msg/task-priority/task-priority_d.xml

index 3d8f51371b5d4b0e6bdd7aec403d86501dd105f8..5d15f2b87fbcb5397bcfc0b7dc3b2e3ea49e471f 100644 (file)
--- a/examples/msg/task-priority/task-priority_d.xml
+++ b/examples/msg/task-priority/task-priority_d.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Fafard" function="test">
+<platform version="4.1">
+  <actor host="Fafard" function="test">
      <argument value="76296000"/>
      <argument value="1.0"/>
      <argument value="76296000"/>
      <argument value="1.0"/>
-  </process>
-  <process host="Fafard" function="test">
+  </actor>
+  <actor host="Fafard" function="test">
      <argument value="76296000"/>
      <argument value="2.0"/>
      <argument value="76296000"/>
      <argument value="2.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml

index 37b973aceebb430613ffe3438407171fabc7c833..ea93cd3740012de36a7debcce873b6f55717f1a1 100644 (file)
--- a/examples/platforms/bypassASroute.xml
+++ b/examples/platforms/bypassASroute.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <cluster id="my_cluster_1" prefix="" suffix="" radical="1" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_2" prefix="" suffix="" radical="2" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_3" prefix="" suffix="" radical="3" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_1" prefix="" suffix="" radical="1" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_2" prefix="" suffix="" radical="2" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_3" prefix="" suffix="" radical="3" speed="1Gf" bw="125MBps" lat="50us"/>
@@ -12,21 +12,21 @@
  
      <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
  
  
      <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">
+    <zoneRoute 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">
+    </zoneRoute>
+    <zoneRoute 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">
+    </zoneRoute>
+    <zoneRoute 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>
+    </zoneRoute>
  
      <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"/>
      </bypassASroute>
  
      <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"/>
      </bypassASroute>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml

index 4b99bccaf7e0cdf8cde1fc0a5cd32c6dd1510b65..072fe3a95606fdfb711b0efdf36d6d890d1cd165 100644 (file)
--- a/examples/platforms/bypassRoute.xml
+++ b/examples/platforms/bypassRoute.xml
@@ -1,17 +1,17 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS_Big" routing="Dijkstra">
-    <AS id="AS_1" routing="Full">
+<platform version="4.1">
+  <zone  id="AS_Big" routing="Dijkstra">
+    <zone id="AS_1" routing="Full">
        <host id="AS_1_host1" speed="1Gf"/>
        <link id="AS_1_link" bandwidth="1.25GBps" latency="500us"/>
        <router id="AS_1_gateway"/>
        <route src="AS_1_host1" dst="AS_1_gateway">
          <link_ctn id="AS_1_link"/>
        </route>
        <host id="AS_1_host1" speed="1Gf"/>
        <link id="AS_1_link" bandwidth="1.25GBps" latency="500us"/>
        <router id="AS_1_gateway"/>
        <route src="AS_1_host1" dst="AS_1_gateway">
          <link_ctn id="AS_1_link"/>
        </route>
-    </AS>
+    </zone>
  
  
-    <AS id="AS_2" routing="Floyd">
+    <zone id="AS_2" routing="Floyd">
        <host id="AS_2_host1" speed="1Gf"/>
        <host id="AS_2_host2" speed="1Gf"/>
        <host id="AS_2_host3" speed="1Gf"/>
        <host id="AS_2_host1" speed="1Gf"/>
        <host id="AS_2_host2" speed="1Gf"/>
        <host id="AS_2_host3" speed="1Gf"/>
@@ -60,12 +60,12 @@
          <link_ctn id="AS_2_link6"/>
          <link_ctn id="AS_2_link5"/>
        </bypassRoute>
          <link_ctn id="AS_2_link6"/>
          <link_ctn id="AS_2_link5"/>
        </bypassRoute>
-    </AS>
+    </zone>
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
  
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
  
-    <ASroute src="AS_1" dst="AS_2" gw_src="AS_1_gateway" gw_dst="AS_2_gateway">
+    <zoneRoute src="AS_1" dst="AS_2" gw_src="AS_1_gateway" gw_dst="AS_2_gateway">
        <link_ctn id="backbone"/>
        <link_ctn id="backbone"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml

index fe0774bd8c3b6dad67ba8daa459bdc5323f6adf5..82672eaf46a5c09b24e319667e1e28a8559aa601 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Vivaldi">
-    <AS id="AS1_dc1" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Vivaldi">
+    <zone 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 -->
        <!--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 -->
@@ -18,7 +18,7 @@
        <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  -->
        <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">
+      <zone id="gw_AS1_dc1" routing="Floyd">
          <!-- equipments-->
          <router id="gw_dc1_horizdist"/>
          <router id="gw_dc1_maindist"/>
          <!-- equipments-->
          <router id="gw_dc1_horizdist"/>
          <router id="gw_dc1_maindist"/>
@@ -39,51 +39,51 @@
          <route src="gw_dc1_entranceroom" dst="router_AS1_dc1">
            <link_ctn id="dc1_entranceroom_ISP"/>
          </route>
          <route src="gw_dc1_entranceroom" dst="router_AS1_dc1">
            <link_ctn id="dc1_entranceroom_ISP"/>
          </route>
-      </AS>
+      </zone>
  
        <!-- internal routes between clusters -->
  
        <!-- internal routes between clusters -->
-      <ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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">
+      </zoneRoute>
+      <!-- routes to exit zone -->
+      <zoneRoute 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"/>
          <link_ctn id="link_dc1_cb1"/>
-      </ASroute>
-      <ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute> 
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_src="gw_dc1_horizdist">
          <link_ctn id="link_dc1_cb2"/>
-      </ASroute>
-    </AS>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS2_dc2" routing="Full">
+    <zone 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 -->
        <!--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 -->
@@ -108,7 +108,7 @@
        <link id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
  
        <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
        <link id="link_dc2_cb6" 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">
+      <zone id="gw_AS2_dc2" routing="Floyd">
          <!-- equipments-->
          <router id="gw_dc2_horizdist"/>
          <router id="gw_dc2_maindist"/>
          <!-- equipments-->
          <router id="gw_dc2_horizdist"/>
          <router id="gw_dc2_maindist"/>
@@ -130,137 +130,137 @@
          <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
            <link_ctn id="dc2_entranceroom_ISP"/>
          </route>
          <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
            <link_ctn id="dc2_entranceroom_ISP"/>
          </route>
-      </AS>
+      </zone>
  
        <!-- internal routes between clusters -->
  
        <!-- internal routes between clusters -->
-      <ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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" 
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_dst="cb3-AS2_cb3_router.dc2.acloud.com">
          <link_ctn id="link_dc2_cb1"/>
          <link_ctn id="link_dc2_cb3"/>
-      </ASroute>
+      </zoneRoute>
  
  
-      <!-- routess to exit AS -->
-      <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com"
+      <!-- routess to exit zone -->
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute> 
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_src="gw_dc2_horizdist">
          <link_ctn id="link_dc2_cb1"/>
-      </ASroute> 
-    </AS>
+      </zoneRoute> 
+    </zone>
  
  
-    <AS id="AS3_dc3" routing="Full">  
+    <zone 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 -->
        <!--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 -->
@@ -278,7 +278,7 @@
        <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  -->
        <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">
+      <zone id="gw_AS3_dc3" routing="Floyd">
          <!-- equipments-->
          <router id="gw_dc3_horizdist"/>
          <router id="gw_dc3_maindist"/>
          <!-- equipments-->
          <router id="gw_dc3_horizdist"/>
          <router id="gw_dc3_maindist"/>
@@ -299,73 +299,73 @@
          <route src="gw_dc3_entranceroom" dst="router_AS3_dc3">
            <link_ctn id="dc3_entranceroom_ISP"/>
          </route>
          <route src="gw_dc3_entranceroom" dst="router_AS3_dc3">
            <link_ctn id="dc3_entranceroom_ISP"/>
          </route>
-      </AS>
+      </zone>
  
        <!-- internal routes between clusters -->
  
        <!-- internal routes between clusters -->
-      <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_dst="cb1-AS3_cb1_router.dc3.acloud.com">
          <link_ctn id="link_dc3_cb4"/>
          <link_ctn id="link_dc3_cb1"/>
-      </ASroute>
+      </zoneRoute>
  
  
-      <!-- routes to exit AS -->
-      <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com"
+      <!-- routes to exit zone -->
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_src="gw_dc3_horizdist">
          <link_ctn id="link_dc3_cb4"/>
-      </ASroute>
-    </AS>
-  </AS>
+      </zoneRoute>
+    </zone>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml

index db66bf0d8f26df198eff17ed231ed9528762fe3d..628427b129116d23873a4e3e0ad739778311ed45 100644 (file)
--- a/examples/platforms/cluster.xml
+++ b/examples/platforms/cluster.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!--             _________
                    |          |
                    |  router  |
    <!--             _________
                    |          |
                    |  router  |
diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml

index fbdad7e8ad7ba7cbfb19c58092cc7ef508a089ea..165f6d4a798692bc89ab6de12c124e8fa34e8521 100644 (file)
--- a/examples/platforms/cluster_and_one_host.xml
+++ b/examples/platforms/cluster_and_one_host.xml
@@ -1,18 +1,18 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
  
-    <AS id="AS1" routing="None">
+    <zone id="AS1" routing="None">
        <host id="host1" speed="1Gf"/>
        <host id="host1" speed="1Gf"/>
-    </AS>
+    </zone>
  
      <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">
+    <zoneRoute src="my_cluster_1" dst="AS1" gw_src="router1" gw_dst="host1">
        <link_ctn id="link1"/>
        <link_ctn id="link1"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cluster_dragonfly.xml b/examples/platforms/cluster_dragonfly.xml

index a8d66d0ab1a4e4b0571debc00939f0c2c21d12ca..c54d4d6897529de509de4d387114860091d8586a 100644 (file)
--- a/examples/platforms/cluster_dragonfly.xml
+++ b/examples/platforms/cluster_dragonfly.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cluster_fat_tree.xml b/examples/platforms/cluster_fat_tree.xml

index 83ff7d9250edd5689c97abf7aa47d900f03f5e25..77a72371460df2d1d8bc847d984a1c8aa1c4374c 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- 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">
+  <zone 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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cluster_no_backbone.xml b/examples/platforms/cluster_no_backbone.xml

index 249f7ccb4e9416406c1369d6518e41388cbb35f2..c3acb30446278dc6cb6a934ebeaae699a6a8afca 100644 (file)
--- a/examples/platforms/cluster_no_backbone.xml
+++ b/examples/platforms/cluster_no_backbone.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!--           _________
                  |          |
                  |  router  |
    <!--           _________
                  |          |
                  |  router  |
@@ -12,7 +12,7 @@
                  /     |     \
              host0   host1   host2
    -->
                  /     |     \
              host0   host1   host2
    -->
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
      <cluster id="my_cluster_1" prefix="" suffix="" radical="0-262144" speed="1Gf" bw="125MBps" lat="50us"/>
      <cluster id="my_cluster_1" prefix="" suffix="" radical="0-262144" speed="1Gf" bw="125MBps" lat="50us"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/cluster_torus.xml b/examples/platforms/cluster_torus.xml

index 8fb7a06794191548fdcb00d2228862e6e82d4294..1f9c8c096082b921ef56ffb63bc6e3c5928249a6 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <cluster id="bob_cluster" prefix="node-" radical="0-11" suffix=".acme.org" speed="1Gf" 
               bw="125MBps" lat="50us" topology="TORUS" topo_parameters="3,2,2" loopback_bw="100MBps" loopback_lat="0"/>
      <cluster id="bob_cluster" prefix="node-" radical="0-11" suffix=".acme.org" speed="1Gf" 
               bw="125MBps" lat="50us" topology="TORUS" topo_parameters="3,2,2" loopback_bw="100MBps" loopback_lat="0"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml

index fe25716dfc6e4f10d79e548de6bdc99e977ba0a7..3bd41a531f5ae543c3d911449146cea56d7240d2 100644 (file)
--- a/examples/platforms/config.xml
+++ b/examples/platforms/config.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <config id="General">
      <prop id="maxmin/precision" value="0.000010"></prop>
      <prop id="cpu/optim" value="TI"></prop>
    <config id="General">
      <prop id="maxmin/precision" value="0.000010"></prop>
      <prop id="cpu/optim" value="TI"></prop>
@@ -10,7 +10,7 @@
      <prop id="smpi/bw-factor" value="65472:0.940694;15424:0.697866;9376:0.58729"></prop>
    </config>
  
      <prop id="smpi/bw-factor" value="65472:0.940694;15424:0.697866;9376:0.58729"></prop>
    </config>
  
-  <AS  id="AS0"  routing="Full">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
@@ -23,5 +23,5 @@
        <link_ctn id="link2"/>
        <link_ctn id="link3"/>
      </route>
        <link_ctn id="link2"/>
        <link_ctn id="link3"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml

index 84fa6bc8ea8d58a2d170ad6df0af19de6abda9ab..38b306b63676a56d80fbfd39de96b18af53862c7 100644 (file)
--- a/examples/platforms/config_tracing.xml
+++ b/examples/platforms/config_tracing.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <config id="example config">
      <prop id="tracing/uncategorized" value="yes"/>
      <prop id="tracing/buffer" value="yes"/>
    <config id="example config">
      <prop id="tracing/uncategorized" value="yes"/>
      <prop id="tracing/buffer" value="yes"/>
@@ -11,7 +11,7 @@
      <prop id="tracing/categorized" value="yes"/>
    </config>
  
      <prop id="tracing/categorized" value="yes"/>
    </config>
  
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
@@ -117,5 +117,5 @@
        <link_ctn id="6"/>
        <link_ctn id="7"/>
      </route>
        <link_ctn id="6"/>
        <link_ctn id="7"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/crosstraffic.xml b/examples/platforms/crosstraffic.xml

index 50c09d22ddd18f7ce669b1ad3edb539be82db413..dedcff8ab076b869427d3eb6563c269666727c2e 100644 (file)
--- a/examples/platforms/crosstraffic.xml
+++ b/examples/platforms/crosstraffic.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- S1 _________ C1
             link 1
           10kB, 10ms    -->
         
    <!-- S1 _________ C1
             link 1
           10kB, 10ms    -->
         
-  <AS id="1" routing="Full">
+  <zone id="1" routing="Full">
      <host id="S1" speed="1Gf"/>
      <host id="C1" speed="1Gf"/>
  
      <host id="S1" speed="1Gf"/>
      <host id="C1" speed="1Gf"/>
  
@@ -17,5 +17,5 @@
      <route src="C1" dst="S1" symmetrical="NO">
        <link_ctn id="1" direction="UP"/>
      </route>
      <route src="C1" dst="S1" symmetrical="NO">
        <link_ctn id="1" direction="UP"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml

index 807b0a0c8ce6c627e0fb3e5e1557468d276fadaf..95e8167088ffab8a862f65a436d6fc2b622ed6e7 100644 (file)
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Vivaldi">
-    <AS id="dataCenter1" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Vivaldi">
+    <zone 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"
        <!-- 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"
@@ -17,7 +17,7 @@
        <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  -->
        <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">
+      <zone id="gw_dataCenter1" routing="Floyd">
          <!-- equipments-->
          <router id="gw_dc1_horizdist"/>
          <router id="gw_dc1_maindist"/>
          <!-- equipments-->
          <router id="gw_dc1_horizdist"/>
          <router id="gw_dc1_maindist"/>
@@ -41,24 +41,24 @@
          <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
            <link_ctn id="dc1_entranceroom_ISP"/>
          </route>
          <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
            <link_ctn id="dc1_entranceroom_ISP"/>
          </route>
-      </AS>
+      </zone>
  
        <!-- internal routes between cabinets -->
  
        <!-- internal routes between cabinets -->
-      <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 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"
+      </zoneRoute>
+      <zoneRoute 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"/>
                 gw_dst="cb2-cabinet2_router.dc1.acloud.com">
          <link_ctn id="link_dc1_cb1"/>
          <link_ctn id="link_dc1_cb2"/>
-      </ASroute>
-    </AS>
-  </AS>
+      </zoneRoute>
+    </zone>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/dogbone.xml b/examples/platforms/dogbone.xml

index 26a1a9949b9645aec0545b12cff263827e247b97..65879331f02e9fdbe42892b77c1eb436e53df1b0 100644 (file)
--- a/examples/platforms/dogbone.xml
+++ b/examples/platforms/dogbone.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="S1" speed="1Gf"/>
      <host id="C1" speed="1Gf"/>
      <host id="S2" speed="1Gf"/>
      <host id="S1" speed="1Gf"/>
      <host id="C1" speed="1Gf"/>
      <host id="S2" speed="1Gf"/>
@@ -50,5 +50,5 @@
      <route src="R2" dst="C2">
        <link_ctn id="5"/>
      </route>
      <route src="R2" dst="C2">
        <link_ctn id="5"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml

index 0d15f719f20a20a49ff6ae38cc4b57958152c94f..680a30e28c8c85c51bd3bbcb1a8078cd6d2c1070 100644 (file)
--- a/examples/platforms/energy_cluster.xml
+++ b/examples/platforms/energy_cluster.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <cluster id="cluster" prefix="MyHost" radical="1-2" suffix="" speed="100.0Mf,50.0Mf,20.0Mf"
             bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
      <!--  List of idle_power:min_power:max_power pairs (in Watts) -->
    <cluster id="cluster" prefix="MyHost" radical="1-2" suffix="" speed="100.0Mf,50.0Mf,20.0Mf"
             bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
      <!--  List of idle_power:min_power:max_power pairs (in Watts) -->
diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml

index d1ca0ff79f90ca8ab2a7a1b94d67751e197b38bf..0af3e71fc513861cc57dddfa669235408116d709 100644 (file)
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
      <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the lowest pstate corresponds to the highest
           processor speed) -->
      <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
      <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the lowest pstate corresponds to the highest
           processor speed) -->
@@ -31,5 +31,5 @@
      <route src="MyHost2" dst="MyHost3">
        <link_ctn id="bus"/>
      </route>
      <route src="MyHost2" dst="MyHost3">
        <link_ctn id="bus"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/faulty_host.xml b/examples/platforms/faulty_host.xml

index bcb382caa929d63fe7a979fd89e294555733f6d8..60dc58aca024e28b6c6433c7d8445a0484a126a6 100644 (file)
--- a/examples/platforms/faulty_host.xml
+++ b/examples/platforms/faulty_host.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
      <host id="Safe Host" speed="500Mf"/>
      <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
      <host id="Safe Host" speed="500Mf"/>
-  </AS>
+  </zone>
  </platform>
  
  </platform>
  
diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml

index 9a8ae89758376421b9bd74959ff507bfe0b4bae3..234b305cfebf3657cc7810b9ccf790078162164c 100644 (file)
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -1,5 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4.1">
  
  <!--
    This file is a manual and imperfect description of the Grid'5000 platform.
  
  <!--
    This file is a manual and imperfect description of the Grid'5000 platform.
@@ -12,9 +13,8 @@
  
  -->
  
  
  -->
  
-<platform version="4">
-  <AS id="AS_grid5000" routing="Floyd">
-    <AS id="AS_interne" routing="Floyd">
+  <zone id="AS_grid5000" routing="Floyd">
+    <zone id="AS_interne" routing="Floyd">
        <router id="lille"/>
        <router id="paris"/>
        <router id="nancy"/>
        <router id="lille"/>
        <router id="paris"/>
        <router id="nancy"/>
@@ -63,8 +63,8 @@
        <route src="marseille" dst="toulouse">
          <link_ctn id="Marseille_Toulouse"/>
        </route>
        <route src="marseille" dst="toulouse">
          <link_ctn id="Marseille_Toulouse"/>
        </route>
-    </AS>
-    <AS id="AS_bordeaux" routing="Full">
+    </zone>
+    <zone 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"/>
        <link id="link_bordeplage" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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"/>
        <link id="link_bordeplage" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
@@ -74,36 +74,36 @@
        <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr" radical="1-10" speed="13.357E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_borderline" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr" radical="1-10" speed="13.357E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_borderline" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_bordeaux" routing="Full">
+      <zone id="gw_AS_bordeaux" routing="Full">
          <router id="gw_bordeaux"/>
          <router id="gw_bordeaux"/>
-      </AS>
+      </zone>
        <link id="link_gw_bordeaux" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
+      <zoneRoute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
          <link_ctn id="link_bordereau"/>
          <link_ctn id="link_bordereau"/>
-      </ASroute>
-      <ASroute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
+      </zoneRoute>
+      <zoneRoute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
          <link_ctn id="link_bordeplage"/>
          <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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
+   </zone>
  
  
-    <AS id="AS_grenoble" routing="Full">
+    <zone id="AS_grenoble" routing="Full">
        <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr" radical="1-12" speed="23.681E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_adonis" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr" radical="1-12" speed="23.681E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_adonis" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
@@ -113,36 +113,36 @@
        <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr" radical="1-34" speed="21.175E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_genepi" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr" radical="1-34" speed="21.175E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_genepi" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_grenoble" routing="Full">
+      <zone id="gw_AS_grenoble" routing="Full">
          <router id="gw_grenoble"/>
          <router id="gw_grenoble"/>
-      </AS>
+      </zone>
        <link id="link_gw_grenoble" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <link id="link_gw_grenoble" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <ASroute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
+      <zoneRoute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
          <link_ctn id="link_genepi"/>
          <link_ctn id="link_adonis"/>
          <link_ctn id="link_genepi"/>
          <link_ctn id="link_adonis"/>
-      </ASroute>
-      <ASroute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
+      </zoneRoute>
+      <zoneRoute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr">
          <link_ctn id="link_edel"/>
          <link_ctn id="link_adonis"/>
          <link_ctn id="link_edel"/>
          <link_ctn id="link_adonis"/>
-      </ASroute>
-      <ASroute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr">
+      </zoneRoute>
+      <zoneRoute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr">
          <link_ctn id="link_edel"/>
          <link_ctn id="link_genepi"/>
          <link_ctn id="link_edel"/>
          <link_ctn id="link_genepi"/>
-      </ASroute>
+      </zoneRoute>
  
  
-      <ASroute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
+      <zoneRoute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
          <link_ctn id="link_adonis"/>
          <link_ctn id="link_adonis"/>
-      </ASroute>
-      <ASroute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
+      </zoneRoute>
+      <zoneRoute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
          <link_ctn id="link_genepi"/>
          <link_ctn id="link_genepi"/>
-      </ASroute>
-      <ASroute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
+      </zoneRoute>
+      <zoneRoute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble">
          <link_ctn id="link_edel"/>
          <link_ctn id="link_edel"/>
-      </ASroute>
-    </AS>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_lille" routing="Full">
+    <zone id="AS_lille" routing="Full">
        <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr" radical="1-26" speed="8.9618E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_chicon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr" radical="1-26" speed="8.9618E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_chicon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
@@ -155,174 +155,174 @@
        <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr" radical="1-8" speed="24.473E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_chirloute" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr" radical="1-8" speed="24.473E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_chirloute" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_lille" routing="Full">
+      <zone id="gw_AS_lille" routing="Full">
          <router id="gw_lille"/>
          <router id="gw_lille"/>
-      </AS>
+      </zone>
        <link id="link_gw_lille" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <link id="link_gw_lille" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <ASroute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
+      <zoneRoute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
          <link_ctn id="link_chirloute"/>
          <link_ctn id="link_chinqchint"/>
          <link_ctn id="link_chirloute"/>
          <link_ctn id="link_chinqchint"/>
-      </ASroute>
-      <ASroute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
+      </zoneRoute>
+      <zoneRoute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
          <link_ctn id="link_chimint"/>
          <link_ctn id="link_chinqchint"/>
          <link_ctn id="link_chimint"/>
          <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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
   
   
-      <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">
+      <zoneRoute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chinqchint"/>
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chinqchint"/>
-      </ASroute>
-      <ASroute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
+      </zoneRoute>
+      <zoneRoute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chirloute"/>
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chirloute"/>
-      </ASroute>
-      <ASroute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr">
+      </zoneRoute>
+      <zoneRoute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr">
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chimint"/>
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chimint"/>
-      </ASroute>
+      </zoneRoute>
  
  
-      <ASroute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille">
+      <zoneRoute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille">
          <link_ctn id="link_chinqchint"/>
          <link_ctn id="link_chinqchint"/>
-      </ASroute>
-      <ASroute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille">
+      </zoneRoute>
+      <zoneRoute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille">
          <link_ctn id="link_chirloute"/>
          <link_ctn id="link_chirloute"/>
-      </ASroute>
-      <ASroute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille">
+      </zoneRoute>
+      <zoneRoute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille">
          <link_ctn id="link_chimint"/>
          <link_ctn id="link_chimint"/>
-      </ASroute>
-      <ASroute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille">
+      </zoneRoute>
+      <zoneRoute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille">
          <link_ctn id="link_chicon"/>
          <link_ctn id="link_chicon"/>
-      </ASroute>
-    </AS>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_lyon" routing="Full">
+    <zone id="AS_lyon" routing="Full">
        <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr" radical="1-56" speed="4.7233E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_capricorne" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr" radical="1-79" speed="5.6693E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_sagittaire" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr" radical="1-56" speed="4.7233E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_capricorne" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr" radical="1-79" speed="5.6693E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_sagittaire" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_lyon" routing="Full">
+      <zone id="gw_AS_lyon" routing="Full">
          <router id="gw_lyon"/>
          <router id="gw_lyon"/>
-      </AS>
+      </zone>
        <link id="link_gw_lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_nancy" routing="Full">
-      <AS id="AS_graphene" routing="Full">
+    <zone id="AS_nancy" routing="Full">
+      <zone id="AS_graphene" routing="Full">
          <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
          <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
-        <AS id="gw_AS_graphene" routing="Full">
+        <zone id="gw_AS_graphene" routing="Full">
            <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
            <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
-        </AS>
+        </zone>
          <link id="switch-graphene" bandwidth="1250000000Bps" latency="5E-4s"/>
  
          <link id="switch-graphene" bandwidth="1250000000Bps" latency="5E-4s"/>
  
-        <ASroute src="AS_sgraphene2" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+        <zoneRoute src="AS_sgraphene2" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene3" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene3" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene3" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene3" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene1" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene1" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene1" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene1" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene1" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene1" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
+        </zoneRoute>
  
  
-        <ASroute src="AS_sgraphene4" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+        <zoneRoute src="AS_sgraphene4" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene2" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene2" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene3" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene3" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        <ASroute src="AS_sgraphene1" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgraphene1" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
            <link_ctn id="switch-graphene"/>
            <link_ctn id="switch-graphene"/>
-        </ASroute>
-        </AS>
+        </zoneRoute>
+        </zone>
        <link id="link_graphene" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <link id="link_graphene" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="AS_griffon" routing="Full">
+      <zone id="AS_griffon" routing="Full">
          <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
          <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
-        <AS id="gw_AS_griffon" routing="Full">
+        <zone id="gw_AS_griffon" routing="Full">
            <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
            <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
-        </AS>
+        </zone>
          <link id="switch-griffon" bandwidth="1250000000Bps" latency="5E-4s"/>
  
          <link id="switch-griffon" bandwidth="1250000000Bps" latency="5E-4s"/>
  
-        <ASroute src="AS_sgriffon2" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+        <zoneRoute src="AS_sgriffon2" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
            <link_ctn id="switch-griffon"/>
            <link_ctn id="switch-griffon"/>
-        </ASroute>
-        <ASroute src="AS_sgriffon3" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgriffon3" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
            <link_ctn id="switch-griffon"/>
            <link_ctn id="switch-griffon"/>
-        </ASroute>
-        <ASroute src="AS_sgriffon3" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_sgriffon3" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
            <link_ctn id="switch-griffon"/>
            <link_ctn id="switch-griffon"/>
-        </ASroute>
+        </zoneRoute>
  
  
-        <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">
+        <zoneRoute 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"/>
            <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">
+        </zoneRoute>
+        <zoneRoute 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"/>
            <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">
+        </zoneRoute>
+        <zoneRoute 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"/>
            <link_ctn id="switch-griffon"/>
-        </ASroute>
-        </AS>
+        </zoneRoute>
+        </zone>
        <link id="link_griffon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <link id="link_griffon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_nancy" routing="Full">
+      <zone id="gw_AS_nancy" routing="Full">
          <router id="gw_nancy"/>
          <router id="gw_nancy"/>
-      </AS>
+      </zone>
        <link id="link_gw_nancy" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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"/>
          <link_ctn id="link_griffon"/>
-      </ASroute>
-    </AS>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_orsay" routing="Full">
-      <AS id="AS_gdx" routing="Full">
+    <zone id="AS_orsay" routing="Full">
+      <zone id="AS_gdx" routing="Full">
          <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
@@ -335,235 +335,235 @@
          <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
          <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
          <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
  
-        <AS id="gw_AS_gdx" routing="Full">
+        <zone id="gw_AS_gdx" routing="Full">
            <router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
            <router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
-        </AS>
+        </zone>
          <link id="switch-gdx" bandwidth="1250000000Bps" latency="5E-4s"/>
  
          <link id="switch-gdx" bandwidth="1250000000Bps" latency="5E-4s"/>
  
-        <ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        <zoneRoute src="AS_netgear06.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear08.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch14.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear05.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear05.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
+        </zoneRoute>
  
  
-        <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        <zoneRoute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear06.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear06.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear08.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear08.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch14.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch14.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear05.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear05.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear03.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear03.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear07.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear07.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear01.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear01.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_switch15.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_switch15.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear02.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear02.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-        <ASroute src="AS_netgear04.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+        </zoneRoute>
+        <zoneRoute src="AS_netgear04.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
            <link_ctn id="switch-gdx"/>
            <link_ctn id="switch-gdx"/>
-        </ASroute>
-      </AS>
+        </zoneRoute>
+      </zone>
        <link id="link_gdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr" radical="1-30" speed="4.7144E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_netgdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <link id="link_gdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr" radical="1-30" speed="4.7144E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_netgdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_orsay" routing="Full">
+      <zone id="gw_AS_orsay" routing="Full">
          <router id="gw_orsay"/>
          <router id="gw_orsay"/>
-      </AS>
+      </zone>
        <link id="link_gw_orsay" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_rennes" routing="Full">
+    <zone id="AS_rennes" routing="Full">
        <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr" radical="1-64" speed="21.496E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_paradent" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr" radical="1-64" speed="21.496E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_paradent" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
@@ -576,51 +576,51 @@
        <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr" radical="1-40" speed="27.391E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_parapluie" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr" radical="1-40" speed="27.391E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_parapluie" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_rennes" routing="Full">
+      <zone id="gw_AS_rennes" routing="Full">
          <router id="gw_rennes"/>
          <router id="gw_rennes"/>
-      </AS>
+      </zone>
        <link id="link_gw_rennes" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_sophia" routing="Full">
+    <zone id="AS_sophia" routing="Full">
        <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr" radical="1-56" speed="7.7318E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_helios" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr" radical="1-56" speed="7.7318E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_helios" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
@@ -630,86 +630,86 @@
        <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr" radical="1-45" speed="23.530E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_suno" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr" radical="1-45" speed="23.530E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_suno" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_sophia" routing="Full">
+      <zone id="gw_AS_sophia" routing="Full">
          <router id="gw_sophia"/>
          <router id="gw_sophia"/>
-      </AS>
+      </zone>
        <link id="link_gw_sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia">
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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">
+      </zoneRoute>
+      <zoneRoute 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>
+      </zoneRoute>
+    </zone>
  
  
-    <AS id="AS_toulouse" routing="Full">
+    <zone id="AS_toulouse" routing="Full">
        <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr" radical="1-80" speed="9.5674E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_pastel" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr" radical="1-52" speed="5.1143E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_violette" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr" radical="1-80" speed="9.5674E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_pastel" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr" radical="1-52" speed="5.1143E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
        <link id="link_violette" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
-      <AS id="gw_AS_toulouse" routing="Full">
+      <zone id="gw_AS_toulouse" routing="Full">
          <router id="gw_toulouse"/>
          <router id="gw_toulouse"/>
-      </AS>
+      </zone>
        <link id="link_gw_toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
  
        <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">
+      <zoneRoute 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>
+      </zoneRoute>
  
  
-      <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
+      <zoneRoute 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"/>
          <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">
+      </zoneRoute>
+      <zoneRoute 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_violette"/>
-      </ASroute>
-    </AS>
+      </zoneRoute>
+    </zone>
  
  
-    <ASroute src="AS_toulouse" dst="AS_interne" gw_src="gw_toulouse" gw_dst="toulouse">
+    <zoneRoute src="AS_toulouse" dst="AS_interne" gw_src="gw_toulouse" gw_dst="toulouse">
        <link_ctn id="link_gw_toulouse"/>
        <link_ctn id="link_gw_toulouse"/>
-    </ASroute>
-    <ASroute src="AS_sophia" dst="AS_interne" gw_src="gw_sophia" gw_dst="sophia">
+    </zoneRoute>
+    <zoneRoute src="AS_sophia" dst="AS_interne" gw_src="gw_sophia" gw_dst="sophia">
        <link_ctn id="link_gw_sophia"/>
        <link_ctn id="link_gw_sophia"/>
-    </ASroute>
-    <ASroute src="AS_rennes" dst="AS_interne" gw_src="gw_rennes" gw_dst="rennes">
+    </zoneRoute>
+    <zoneRoute src="AS_rennes" dst="AS_interne" gw_src="gw_rennes" gw_dst="rennes">
        <link_ctn id="link_gw_rennes"/>
        <link_ctn id="link_gw_rennes"/>
-    </ASroute>
-    <ASroute src="AS_orsay" dst="AS_interne" gw_src="gw_orsay" gw_dst="paris">
+    </zoneRoute>
+    <zoneRoute src="AS_orsay" dst="AS_interne" gw_src="gw_orsay" gw_dst="paris">
        <link_ctn id="link_gw_orsay"/>
        <link_ctn id="link_gw_orsay"/>
-    </ASroute>
-    <ASroute src="AS_nancy" dst="AS_interne" gw_src="gw_nancy" gw_dst="nancy">
+    </zoneRoute>
+    <zoneRoute src="AS_nancy" dst="AS_interne" gw_src="gw_nancy" gw_dst="nancy">
        <link_ctn id="link_gw_nancy"/>
        <link_ctn id="link_gw_nancy"/>
-    </ASroute>
-    <ASroute src="AS_lyon" dst="AS_interne" gw_src="gw_lyon" gw_dst="lyon">
+    </zoneRoute>
+    <zoneRoute src="AS_lyon" dst="AS_interne" gw_src="gw_lyon" gw_dst="lyon">
        <link_ctn id="link_gw_lyon"/>
        <link_ctn id="link_gw_lyon"/>
-    </ASroute>
-    <ASroute src="AS_lille" dst="AS_interne" gw_src="gw_lille" gw_dst="lille">
+    </zoneRoute>
+    <zoneRoute src="AS_lille" dst="AS_interne" gw_src="gw_lille" gw_dst="lille">
        <link_ctn id="link_gw_lille"/>
        <link_ctn id="link_gw_lille"/>
-    </ASroute>
-    <ASroute src="AS_grenoble" dst="AS_interne" gw_src="gw_grenoble" gw_dst="grenoble">
+    </zoneRoute>
+    <zoneRoute src="AS_grenoble" dst="AS_interne" gw_src="gw_grenoble" gw_dst="grenoble">
        <link_ctn id="link_gw_grenoble"/>
        <link_ctn id="link_gw_grenoble"/>
-    </ASroute>
-    <ASroute src="AS_bordeaux" dst="AS_interne" gw_src="gw_bordeaux" gw_dst="bordeaux">
+    </zoneRoute>
+    <zoneRoute src="AS_bordeaux" dst="AS_interne" gw_src="gw_bordeaux" gw_dst="bordeaux">
        <link_ctn id="link_gw_bordeaux"/>
        <link_ctn id="link_gw_bordeaux"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml

index 69ac6e4dbcd15db485171880d55c7dc9a526fbd3..8aeb17601c139961f8897d53f6b6029da01a4188 100644 (file)
--- a/examples/platforms/griffon.xml
+++ b/examples/platforms/griffon.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS_griffon"  routing="Full">
+<platform version="4.1">
+  <zone id="AS_griffon"  routing="Full">
      <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
               radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
               bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
      <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
               radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
               bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
@@ -14,20 +14,20 @@
  
      <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
  
  
      <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
  
-    <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
+    <zoneRoute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
               gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
               gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
               gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
               gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
-    </ASroute>
-    <ASroute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
+    </zoneRoute>
+    <zoneRoute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
               gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
             gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
               gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
             gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
-    </ASroute>
-    <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
+    </zoneRoute>
+    <zoneRoute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
               gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
               gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
               gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
               gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
        <link_ctn id="backbone"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/meta_cluster.xml b/examples/platforms/meta_cluster.xml

index 98d6c228d7b36c01cf157e21ad35a593bfb5357c..e30ce55d4274eeb23287d94ab5285dfd472c5e2a 100644 (file)
--- a/examples/platforms/meta_cluster.xml
+++ b/examples/platforms/meta_cluster.xml
@@ -1,29 +1,29 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="my_cluster1"  routing="Cluster">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
+    <zone  id="my_cluster1"  routing="Cluster">
        <cabinet id="cabinet1" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
        <cabinet id="cabinet2" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
        <cabinet id="cabinet3" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
  
        <router  id="router1"/>
        <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
        <cabinet id="cabinet1" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
        <cabinet id="cabinet2" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
        <cabinet id="cabinet3" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
  
        <router  id="router1"/>
        <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
-    </AS>
+    </zone>
  
  
-    <AS  id="my_cluster2"  routing="Cluster">
+    <zone  id="my_cluster2"  routing="Cluster">
        <cabinet id="cabinet1" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
        <cabinet id="cabinet2" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
        <cabinet id="cabinet3" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
  
        <router  id="router2"/>
        <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
        <cabinet id="cabinet1" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
        <cabinet id="cabinet2" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
        <cabinet id="cabinet3" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
  
        <router  id="router2"/>
        <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
-    </AS>
+    </zone>
  
      <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
  
  
      <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
  
-    <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+    <zoneRoute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
        <link_ctn id="link1-2" />
        <link_ctn id="link1-2" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/multicore_machine.xml b/examples/platforms/multicore_machine.xml

index 93134dc42bd87400c9c638f08916acfd86c6b230..68c0e2178f39b094315ef69b6689758d147bbab1 100644 (file)
--- a/examples/platforms/multicore_machine.xml
+++ b/examples/platforms/multicore_machine.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0" routing="Full">
+<platform version="4.1">
+  <zone  id="AS0" routing="Full">
      <host id="Tremblay" speed="98.095Mf" core="6"/>
      <host id="Tremblay" speed="98.095Mf" core="6"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/onelink.xml b/examples/platforms/onelink.xml

index 2a86803c49988a813ed4fed9d6da75bc22f62173..4682e74ce219bcf9ff34b19ceda8ebb8008172de 100644 (file)
--- a/examples/platforms/onelink.xml
+++ b/examples/platforms/onelink.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <!---   S1 <-> link 1 <-> C1  -->
      <!---        (10kB, 10ms)     -->
  
      <!---   S1 <-> link 1 <-> C1  -->
      <!---        (10kB, 10ms)     -->
  
@@ -11,5 +11,5 @@
      <route src="S1" dst="C1">
        <link_ctn id="1"/>
      </route>
      <route src="S1" dst="C1">
        <link_ctn id="1"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml

index eb22be66fdcf17a5bf67390202f4f81966b2a606..fdf39cf84e1acbe7cf2412b3369b24eb305927d3 100644 (file)
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -1,21 +1,21 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- This file describe a super simple platform which main interest is to define some properties on hosts, 
         processes and links. It is used in several regression cases on properties -->
    <!-- This file describe a super simple platform which main interest is to define some properties on hosts, 
         processes and links. It is used in several regression cases on properties -->
-  <AS  id="AS0"  routing="Full">
+  <zone  id="AS0"  routing="Full">
      <prop id="filename" value="prop.xml"/>
      <prop id="date" value="31-08-12"/>
      <prop id="author" value="pnavarro"/>
  
      <prop id="filename" value="prop.xml"/>
      <prop id="date" value="31-08-12"/>
      <prop id="author" value="pnavarro"/>
  
-    <AS id="AS3"  routing="Full">
-      <AS id="AS1" routing="None">
+    <zone id="AS3"  routing="Full">
+      <zone id="AS1" routing="None">
          <prop id="name" value="AS1"/>
          <prop id="name" value="AS1"/>
-      </AS>
-      <AS id="AS2" routing="None">
+      </zone>
+      <zone id="AS2" routing="None">
          <prop id="name" value="AS2"/>
          <prop id="name" value="AS2"/>
-     </AS>
-    </AS>
+     </zone>
+    </zone>
  
      <cluster id="acme" prefix="node-" suffix=".acme.org" radical="0-4" speed="1Gf"
               bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
  
      <cluster id="acme" prefix="node-" suffix=".acme.org" radical="0-4" speed="1Gf"
               bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
@@ -24,7 +24,7 @@
        <prop id="mem"  value="42"/>
      </cluster>
  
        <prop id="mem"  value="42"/>
      </cluster>
  
-    <AS  id="AS4"  routing="Full">
+    <zone  id="AS4"  routing="Full">
        <host id="host1" speed="1Gf">
          <prop id="Hdd" value="180"/>
          <prop id="mem" value="4"/>
        <host id="host1" speed="1Gf">
          <prop id="Hdd" value="180"/>
          <prop id="mem" value="4"/>
@@ -44,6 +44,6 @@
          <link_ctn id="l1"/>
          <link_ctn id="l2"/>
        </route>
          <link_ctn id="l1"/>
          <link_ctn id="l2"/>
        </route>
-    </AS>
-  </AS>
+    </zone>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml

index a5e242e0585e2d373159bf10fbfbe99d4a16b35f..872b3039939155296aa7e10541fe9d0ad81b0827 100644 (file)
--- a/examples/platforms/routing_cluster.xml
+++ b/examples/platforms/routing_cluster.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  <!--              router1 - - - - - - link1-2 - - - - - - router2
         __________________________                   _________________________
         |                        |                   |                        |
  <!--              router1 - - - - - - link1-2 - - - - - - router2
         __________________________                   _________________________
         |                        |                   |                        |
@@ -11,8 +11,8 @@ l1_up / / l1_down  | l3   l2_up\ \ l2_down   l4_up / / l4_down  | l6   l5_up\ \
       / /           |            \ \               / /           |            \ \
      host1         host3         host2           host4         host6          host5
  -->
       / /           |            \ \               / /           |            \ \
      host1         host3         host2           host4         host6          host5
  -->
-  <AS id="AS0" routing="Full">
-    <AS  id="my_cluster1"  routing="Cluster">
+  <zone id="AS0" routing="Full">
+    <zone  id="my_cluster1"  routing="Cluster">
        <router id="router1"/>
  
        <host id="host1" speed="1Gf"/>
        <router id="router1"/>
  
        <host id="host1" speed="1Gf"/>
@@ -29,9 +29,9 @@ l1_up / / l1_down  | l3   l2_up\ \ l2_down   l4_up / / l4_down  | l6   l5_up\ \
        <host_link id="host3" up="l3" down="l3"/>
  
        <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
        <host_link id="host3" up="l3" down="l3"/>
  
        <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
-    </AS>
+    </zone>
  
  
-    <AS  id="my_cluster2"  routing="Cluster">
+    <zone  id="my_cluster2"  routing="Cluster">
        <router id="router2"/>
  
        <host id="host4" speed="1Gf"/>
        <router id="router2"/>
  
        <host id="host4" speed="1Gf"/>
@@ -48,12 +48,12 @@ l1_up / / l1_down  | l3   l2_up\ \ l2_down   l4_up / / l4_down  | l6   l5_up\ \
        <host_link id="host6" up="l6" down="l6"/>
  
        <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
        <host_link id="host6" up="l6" down="l6"/>
  
        <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
-    </AS>
+    </zone>
  
      <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
  
  
      <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
  
-    <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+    <zoneRoute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
        <link_ctn id="link1-2" />
        <link_ctn id="link1-2" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/routing_none.xml b/examples/platforms/routing_none.xml

index 01da662b4608b6270052afff2cbc17fc7af29736..5cd432cccf596701d9844079c130907ff76a8dfd 100644 (file)
--- a/examples/platforms/routing_none.xml
+++ b/examples/platforms/routing_none.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  <!--     This platform does not use any routing. It is what Constant network model expects. -->
  <!--     This platform does not use any routing. It is what Constant network model expects. -->
-  <AS id="AS0" routing="None">
+  <zone id="AS0" routing="None">
      <host id="node-0.acme.org" speed="1Gf"/>
      <host id="node-1.acme.org" speed="1Gf"/>
      <host id="node-2.acme.org" speed="1Gf"/>
      <host id="node-0.acme.org" speed="1Gf"/>
      <host id="node-1.acme.org" speed="1Gf"/>
      <host id="node-2.acme.org" speed="1Gf"/>
@@ -13,5 +13,5 @@
      <host id="node-7.acme.org" speed="1Gf"/>
      <host id="node-8.acme.org" speed="1Gf"/>
      <host id="node-9.acme.org" speed="1Gf"/>
      <host id="node-7.acme.org" speed="1Gf"/>
      <host id="node-8.acme.org" speed="1Gf"/>
      <host id="node-9.acme.org" speed="1Gf"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml

index 9c4185069ca700887e27dc5673eb765555a6d574..3887685f7655fd58d4a5ab05d7454115bf9dbdf1 100644 (file)
--- a/examples/platforms/simulacrum_7_hosts.xml
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  <!-- This is a random platform, generated with Simulacrum.
          http://pda.gforge.inria.fr/tools/download.html
       Unfortunately, the generation parameters were lost with the years. -->
  
  <!-- This is a random platform, generated with Simulacrum.
          http://pda.gforge.inria.fr/tools/download.html
       Unfortunately, the generation parameters were lost with the years. -->
  
-  <AS  id="AS0" routing="Full">
+  <zone  id="AS0" routing="Full">
      <host id="Host 26" speed="3.300140519709234Gf"/>
      <host id="Host 27" speed="3.867398877553016Gf"/>
      <host id="Host 28" speed="1.6522665718098645Gf"/>
      <host id="Host 26" speed="3.300140519709234Gf"/>
      <host id="Host 27" speed="3.867398877553016Gf"/>
      <host id="Host 28" speed="1.6522665718098645Gf"/>
@@ -109,6 +109,6 @@
      <route src="Host 31" dst="Host 32">
        <link_ctn id="l173"/>
      </route>
      <route src="Host 31" dst="Host 32">
        <link_ctn id="l173"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  
  </platform>
  
diff --git a/examples/platforms/small_platform.xml b/examples/platforms/small_platform.xml

index 0f6c5f50f72fc16fd7a788f7cbfe2866afc014c8..576fa7b8d112235891e294b6fdffc6c28a339916 100644 (file)
--- a/examples/platforms/small_platform.xml
+++ b/examples/platforms/small_platform.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone id="zone0" routing="Full">
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
@@ -190,5 +190,5 @@
        <link_ctn id="78"/>
        <link_ctn id="80"/>
      </route>
        <link_ctn id="78"/>
        <link_ctn id="80"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/small_platform_fatpipe.xml b/examples/platforms/small_platform_fatpipe.xml

index cf056b5223c95cec3dfa60442410ccda9d721798..6376744eb6f3e6d69b88ffd6bd792bd482cfc02b 100644 (file)
--- a/examples/platforms/small_platform_fatpipe.xml
+++ b/examples/platforms/small_platform_fatpipe.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Ruby" speed="98.095Mf"/>
      <host id="Perl" speed="98.095Mf"/>
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Ruby" speed="98.095Mf"/>
      <host id="Perl" speed="98.095Mf"/>
@@ -24,5 +24,5 @@
      <route src="Ruby" dst="Perl">
        <link_ctn id="4"/>
      </route>
      <route src="Ruby" dst="Perl">
        <link_ctn id="4"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/small_platform_one_link_routes.xml b/examples/platforms/small_platform_one_link_routes.xml

index 0be82e2e0930b19b425afc2dd69945a921ac17b7..faaad678ee7bf9e6189c5b3f8110e037c3583604 100644 (file)
--- a/examples/platforms/small_platform_one_link_routes.xml
+++ b/examples/platforms/small_platform_one_link_routes.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
@@ -70,5 +70,5 @@
      <route src="Bourassa" dst="Lovelace">
        <link_ctn id="14"/>
      </route>
      <route src="Bourassa" dst="Lovelace">
        <link_ctn id="14"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml

index 6dc6f934442353d4f95b524f710783d35b3a5241..a19986ca7040ebc9610877e7de671aa8c4924f55 100644 (file)
--- a/examples/platforms/small_platform_with_failures.xml
+++ b/examples/platforms/small_platform_with_failures.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="Tremblay" speed="25Mf"/>
      <host id="Jupiter"  speed="25Mf" state_file="trace/jupiter_state.trace"/>
      <host id="Fafard"   speed="25Mf" state_file="trace/fafard_state.trace" />
      <host id="Tremblay" speed="25Mf"/>
      <host id="Jupiter"  speed="25Mf" state_file="trace/jupiter_state.trace"/>
      <host id="Fafard"   speed="25Mf" state_file="trace/fafard_state.trace" />
@@ -66,5 +66,5 @@
      <route src="Ginette" dst="Bourassa">
        <link_ctn id="10"/>
      </route>
      <route src="Ginette" dst="Bourassa">
        <link_ctn id="10"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml

index 91f619c3c53b9f267b3864fd1d202eb723eda939..688d71c01b5225618f257a2600afb9822afa2d6a 100644 (file)
--- a/examples/platforms/small_platform_with_routers.xml
+++ b/examples/platforms/small_platform_with_routers.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
      <host id="Tremblay" speed="98.095Mf"/>
      <host id="Jupiter" speed="76.296Mf"/>
      <host id="Fafard" speed="76.296Mf"/>
@@ -144,5 +144,5 @@
        <link_ctn id="6"/>
        <link_ctn id="7"/>
      </route>
        <link_ctn id="6"/>
        <link_ctn id="7"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml

index 3caa9db0e709eba346888697702eb6a15e0f6673..b654b9cd1923564e61d8c1bcffb658869c590b6b 100644 (file)
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <config>
      <prop id="path" value="../examples/platforms/"/>
    </config>
  
    <config>
      <prop id="path" value="../examples/platforms/"/>
    </config>
  
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
      <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"/> 
      <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"/> 
@@ -56,5 +56,5 @@
      <route src="carl" dst="dave">
        <link_ctn id="link6"/>
      </route>
      <route src="carl" dst="dave">
        <link_ctn id="link6"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml

index 6372351c88947f8ed6e0995b6ee39ab5c934779b..449438eb81dcce648e2a677fc1d102362499bbce 100644 (file)
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <config>
      <prop id="path" value="../examples/platforms/"/>
    </config>
  
    <config>
      <prop id="path" value="../examples/platforms/"/>
    </config>
  
-  <AS id="AS0" routing="Full">
+  <zone 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" />
      <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" />
@@ -46,5 +46,5 @@
      <route src="bob" dst="alice">
        <link_ctn id="link1" />
      </route>
      <route src="bob" dst="alice">
        <link_ctn id="link1" />
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/three_multicore_hosts.xml b/examples/platforms/three_multicore_hosts.xml

index cbc9f00ab125f05d78701639228b1a2f0c25eeca..0b237dafbf6eaf1e6db778efb966c407cdc9f88a 100644 (file)
--- a/examples/platforms/three_multicore_hosts.xml
+++ b/examples/platforms/three_multicore_hosts.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="siteA" routing="Full">
+<platform version="4.1">
+  <zone id="siteA" routing="Full">
      <host id="PM0" speed="8.095Gf" core="4"/>
      <host id="PM1" speed="8.095Gf" core="4"/>
      <host id="PM2" speed="8.095Gf" core="2"/>
      <host id="PM0" speed="8.095Gf" core="4"/>
      <host id="PM1" speed="8.095Gf" core="4"/>
      <host id="PM2" speed="8.095Gf" core="2"/>
@@ -17,5 +17,5 @@
      <route src="PM1" dst="PM2">
        <link_ctn id="link1"/>
      </route>
      <route src="PM1" dst="PM2">
        <link_ctn id="link1"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/two_clusters.xml b/examples/platforms/two_clusters.xml

index bc8567845ad7fbb2598439a38678941cce94783a..29ec61917782341c007d7e1dd7156d03d0b2edad 100644 (file)
--- a/examples/platforms/two_clusters.xml
+++ b/examples/platforms/two_clusters.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  <!--                  _________________________________________
                   ____|_____                                    |
                  |          |                                   |
  <!--                  _________________________________________
                   ____|_____                                    |
                  |          |                                   |
@@ -22,7 +22,7 @@ node-0.acme.org                     node-9.acme.org            |
        |                                |
  node-10.acme.org               node-19.acme.org -->
  
        |                                |
  node-10.acme.org               node-19.acme.org -->
  
-  <AS id="AS0" routing="Full">
+  <zone 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_1" prefix="node-" suffix=".acme.org" radical="0-9" speed="1Gf" 
               bw="125MBps" lat="50us" bb_bw="2.25GBps" bb_lat="500us" />
  
@@ -31,9 +31,9 @@ node-10.acme.org               node-19.acme.org -->
  
      <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"
+    <zoneRoute 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" />
               gw_dst="node-my_cluster_2_router.acme.org">
        <link_ctn id="backbone" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/two_hosts.xml b/examples/platforms/two_hosts.xml

index 2aebc985dab13e2c03565a4b153c4dcdbef99261..b6d03ba236c0cf8d5fc4e25dd07897fa250c0db2 100644 (file)
--- a/examples/platforms/two_hosts.xml
+++ b/examples/platforms/two_hosts.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <host id="Tremblay" speed="25Mf"/>
      <host id="Jupiter" speed="25Mf" availability_file="trace/jupiter_speed.trace"/>
  
      <host id="Tremblay" speed="25Mf"/>
      <host id="Jupiter" speed="25Mf" availability_file="trace/jupiter_speed.trace"/>
  
@@ -10,7 +10,7 @@
      <route src="Tremblay" dst="Jupiter">
        <link_ctn id="1"/>
      </route>
      <route src="Tremblay" dst="Jupiter">
        <link_ctn id="1"/>
      </route>
-  </AS>
+  </zone>
  
    <trace id="Tremblay_power" periodicity="6.0">
      1.0 0.5
  
    <trace id="Tremblay_power" periodicity="6.0">
      1.0 0.5
diff --git a/examples/platforms/two_hosts_platform_shared.xml b/examples/platforms/two_hosts_platform_shared.xml

index 23e1d82e9f944fc9f23dea78323f3303da814e28..362f8a8b3ed43b5321177116efca52cd54b97825 100644 (file)
--- a/examples/platforms/two_hosts_platform_shared.xml
+++ b/examples/platforms/two_hosts_platform_shared.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0" routing="Full">
+<platform version="4.1">
+  <zone  id="AS0" routing="Full">
      <host id="cpu0" speed="4Gf"/>
      <host id="cpu1" speed="4Gf"/>
  
      <host id="cpu0" speed="4Gf"/>
      <host id="cpu1" speed="4Gf"/>
  
@@ -16,5 +16,5 @@
      <route src="cpu1" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
      <route src="cpu1" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml

index c9d6e49432eb88bcabbec2871674608884073cb0..217b7a327fc13080be012d1aedbabc77fd4808b1 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability.xml
+++ b/examples/platforms/two_hosts_platform_with_availability.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="Cpu A" speed="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
      <host id="Cpu B" speed="10f" availability_file="trace/trace_B.txt"/>
      <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
      <route src="Cpu A" dst="Cpu B">
        <link_ctn id="LinkA"/>
      </route>
      <host id="Cpu A" speed="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
      <host id="Cpu B" speed="10f" availability_file="trace/trace_B.txt"/>
      <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
      <route src="Cpu A" dst="Cpu B">
        <link_ctn id="LinkA"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml

index 3eb160fff21e01464485e5ab8e55c0d2eec40fcc..b6fc4190f2a4d5f37c358c334c360cb4c2376776 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability_included.xml
+++ b/examples/platforms/two_hosts_platform_with_availability_included.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <trace id="A" periodicity="1.0">
      0.0 1.0
      11.0 0.5
    <trace id="A" periodicity="1.0">
      0.0 1.0
      11.0 0.5
@@ -16,14 +16,14 @@
      20.0 0.4
    </trace>
  
      20.0 0.4
    </trace>
  
-  <AS id="AS0" routing="Full">
+  <zone 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>
      <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>
+  </zone>
  
    <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="A" element="Cpu A"/>
    <trace_connect kind="HOST_AVAIL" trace="A_failure" element="Cpu A"/>
diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml

index 92ac5d593791ccb08c922ae331f311950c3ee317..723632668a67d94d2c35807beb814398c3d0f8c7 100644 (file)
--- a/examples/platforms/two_peers.xml
+++ b/examples/platforms/two_peers.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Vivaldi">
+<platform version="4.1">
+  <zone id="AS0" routing="Vivaldi">
      <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" />
      <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" />
      <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" />
      <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" />
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml

index f93727d9e49c15d08309f581bb1f658cff2b1fbc..2bb79ed12fbc8ccdd04c4db6f4e185331220167b 100644 (file)
--- a/examples/platforms/vivaldi.xml
+++ b/examples/platforms/vivaldi.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Vivaldi">
+<platform version="4.1">
+  <zone id="AS0" routing="Vivaldi">
      <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
      <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />
      <host id="100041334" coordinates="-15.7 9.9 14.7" speed="2.8Gf" />
      <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
      <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />
      <host id="100041334" coordinates="-15.7 9.9 14.7" speed="2.8Gf" />
@@ -42,5 +42,5 @@
      <host id="100422926" coordinates="-23.1 -7.6 39.9" speed="1.6Gf" />
      <host id="100427449" coordinates="135.5 -21.0 83.4" speed="1.4Gf" />
      <host id="100429957" coordinates="17.5 6.7 18.8" speed="830Mf" />
      <host id="100422926" coordinates="-23.1 -7.6 39.9" speed="1.6Gf" />
      <host id="100427449" coordinates="135.5 -21.0 83.4" speed="1.4Gf" />
      <host id="100429957" coordinates="17.5 6.7 18.8" speed="830Mf" />
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/examples/s4u/actions-comm/s4u_actions-comm_d.xml b/examples/s4u/actions-comm/s4u_actions-comm_d.xml

index cce14e39242f4f2810b21d5d9b1e0a310ebd7171..4e597fc828ae080c3fe40e1affa3e20ae4be72eb 100644 (file)
--- a/examples/s4u/actions-comm/s4u_actions-comm_d.xml
+++ b/examples/s4u/actions-comm/s4u_actions-comm_d.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="p0"/>
-  <process host="Ruby" function="p1"/>
+<platform version="4.1">
+  <actor host="Tremblay" function="p0"/>
+  <actor host="Ruby" function="p1"/>
  </platform>
  </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 a88cf278f0f4f8c149a664d651fdd5779e89d710..71d521a2124f4bdfcbfdc2f071cb6a1275766f4f 100644 (file)
--- a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
+++ b/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
@@ -1,14 +1,14 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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.
+<platform version="4.1">
+<!-- Example file of how to use trace replay, with actions split in separate files, one per actor.
       Launch it like this:
           ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
  
       Launch it like this:
           ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
  
-  <process host="Tremblay" function="p0">
+  <actor host="Tremblay" function="p0">
      <argument value="s4u_actions-comm_split_p0.txt"/>
      <argument value="s4u_actions-comm_split_p0.txt"/>
-  </process>
-  <process host="Ruby"     function="p1">
+  </actor>
+  <actor host="Ruby"     function="p1">
      <argument value="s4u_actions-comm_split_p1.txt"/>
      <argument value="s4u_actions-comm_split_p1.txt"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/s4u/actions-storage/s4u_actions-storage_d.xml b/examples/s4u/actions-storage/s4u_actions-storage_d.xml

index d2eb6821bc3b415a1672830598ffad39d456bc29..3f52ae60c10c9ff5d43f771428e400b9cf4bcd25 100644 (file)
--- a/examples/s4u/actions-storage/s4u_actions-storage_d.xml
+++ b/examples/s4u/actions-storage/s4u_actions-storage_d.xml
@@ -1,5 +1,5 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="denise" function="p0"/>
+<platform version="4.1">
+  <actor host="denise" function="p0"/>
  </platform>
  </platform>
diff --git a/examples/s4u/actor-create/s4u_actor-create_d.xml b/examples/s4u/actor-create/s4u_actor-create_d.xml

index 6cdc3da1dabf29bc347e3363f0dfb299e5fd0d34..11e719b75b1e72a4f95bd111ef52a0ab2f155238 100644 (file)
--- a/examples/s4u/actor-create/s4u_actor-create_d.xml
+++ b/examples/s4u/actor-create/s4u_actor-create_d.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  
    <!-- This a weird deployment file: we only start one actor from here and the others from the main().
      -
  
    <!-- This a weird deployment file: we only start one actor from here and the others from the main().
      -
@@ -8,8 +8,8 @@
      -  Instead, you want to start all your actors from the deployment file.
      -->
     
      -  Instead, you want to start all your actors from the deployment file.
      -->
     
-  <process host="Fafard" function="receiver">
+  <actor host="Fafard" function="receiver">
      <!-- Pass the right mailbox name to the actor -->
      <argument value="mb42" />
      <!-- Pass the right mailbox name to the actor -->
      <argument value="mb42" />
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml b/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml

index 869db931523ab1f3685e44fbd1132febef21d8c6..feadead6cd1fe0078ebc29a4eaae9d646474845b 100644 (file)
--- a/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml
+++ b/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml
@@ -1,27 +1,27 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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="5"/>         <!-- Number of workers -->
      <argument value="20"/>       <!-- Number of tasks -->
      <argument value="50000000"/>  <!-- Computation size of tasks -->
      <argument value="1000000"/>   <!-- Communication size of tasks -->
      <argument value="5"/>         <!-- Number of workers -->
-  </process>
+  </actor>
    <!-- The worker processes (with mailbox to listen on as argument) -->
    <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="worker" on_failure="RESTART">
+  <actor host="Tremblay" function="worker" on_failure="RESTART">
      <argument value="0"/> 
      <argument value="0"/> 
-  </process>
-  <process host="Jupiter" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Jupiter" function="worker" on_failure="RESTART">
      <argument value="1"/> 
      <argument value="1"/> 
-  </process>
-  <process host="Fafard" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Fafard" function="worker" on_failure="RESTART">
      <argument value="2"/> 
      <argument value="2"/> 
-  </process>
-  <process host="Ginette" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Ginette" function="worker" on_failure="RESTART">
      <argument value="3"/> 
      <argument value="3"/> 
-  </process>
-  <process host="Bourassa" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Bourassa" function="worker" on_failure="RESTART">
      <argument value="4"/> 
      <argument value="4"/> 
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/examples/s4u/dht-chord/s4u_dht-chord_d.xml b/examples/s4u/dht-chord/s4u_dht-chord_d.xml

index 26e2b17397977ddb8a19a282f90067ee568ffb91..d2af449509b3c76d74cb51478527b6cae9ab27f2 100644 (file)
--- a/examples/s4u/dht-chord/s4u_dht-chord_d.xml
+++ b/examples/s4u/dht-chord/s4u_dht-chord_d.xml
@@ -1,44 +1,44 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="node">
+<platform version="4.1">
+  <actor host="node-0.acme.org" function="node">
      <argument value="42"/>
      <argument value="1000"/>
      <argument value="42"/>
      <argument value="1000"/>
-  </process>
-  <process host="node-1.acme.org" function="node">
+  </actor>
+  <actor host="node-1.acme.org" function="node">
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="200" />
      <argument value="366680" />
      <argument value="42" />
      <argument value="10" />
      <argument value="200" />
-  </process>
-  <process host="node-2.acme.org" function="node">
+  </actor>
+  <actor host="node-2.acme.org" function="node">
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="400" />
      <argument value="533744" />
      <argument value="366680" />
      <argument value="20" />
      <argument value="400" />
-  </process>
-  <process host="node-3.acme.org" function="node">
+  </actor>
+  <actor host="node-3.acme.org" function="node">
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="150" />
      <argument value="1319738" />
      <argument value="42" />
      <argument value="30" />
      <argument value="150" />
-  </process>
-  <process host="node-4.acme.org" function="node">
+  </actor>
+  <actor host="node-4.acme.org" function="node">
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="300" />
      <argument value="16509405" />
      <argument value="366680" />
      <argument value="40" />
      <argument value="300" />
-  </process>
-  <process host="node-5.acme.org" function="node">
+  </actor>
+  <actor host="node-5.acme.org" function="node">
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="250" />
      <argument value="600" />
      <argument value="10874876" />
      <argument value="533744" />
      <argument value="250" />
      <argument value="600" />
-  </process>
-  <process host="node-6.acme.org" function="node">
+  </actor>
+  <actor host="node-6.acme.org" function="node">
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="800" />
      <argument value="16728096" />
      <argument value="1319738" />
      <argument value="60" />
      <argument value="800" />
-  </process>
-</platform>
-\ No newline at end of file
+  </actor>
+</platform>
diff --git a/examples/smpi/replay_multiple/generate_multiple_deployment.sh b/examples/smpi/replay_multiple/generate_multiple_deployment.sh

index 58e2a0ea9bb5ffba05a4b3958d32a993b8c37e41..e454081f3ff1f981620fd0681281a9257eb849a1 100755 (executable)
--- a/examples/smpi/replay_multiple/generate_multiple_deployment.sh
+++ b/examples/smpi/replay_multiple/generate_multiple_deployment.sh
@@ -114,7 +114,7 @@ APPLICATIONTMP=$(echo ${PROC_ARGS}|cut -d' ' -f2 -s)
  cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  APPLICATIONHEAD
  
  ##---- cache hostnames of hostfile---------------
  APPLICATIONHEAD
  
  ##---- cache hostnames of hostfile---------------
@@ -168,7 +168,7 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then
  ##  hostfile has less than i lines.
  ##----------------------------------------------------------
  
  ##  hostfile has less than i lines.
  ##----------------------------------------------------------
  
-##---- generate <process> tags------------------------------
+##---- generate <actor> tags------------------------------
          do
             if [ -n "${HOSTFILE}" ]; then
                 j=$(( ${NUMPROCS} % ${NUMHOSTS} +1))
          do
             if [ -n "${HOSTFILE}" ]; then
                 j=$(( ${NUMPROCS} % ${NUMHOSTS} +1))
@@ -180,13 +180,13 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then
                 host="${hostname}"
              fi
          
                 host="${hostname}"
              fi
          
-            echo "  <process host=\"${host}\" function=\"${instance}\"> <!-- function name used only for logging -->" >> ${APPLICATIONTMP}
+            echo "  <actor host=\"${host}\" function=\"${instance}\"> <!-- function name used only for logging -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"${instance}\"/> <!-- instance -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"${i}\"/> <!-- rank -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"$(echo $hosttrace|cut -d' ' -f$(($i+1)))\"/>" >> ${APPLICATIONTMP}
             
              echo "    <argument value=\"${sleeptime}\"/> <!-- delay -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"${instance}\"/> <!-- instance -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"${i}\"/> <!-- rank -->" >> ${APPLICATIONTMP}
              echo "    <argument value=\"$(echo $hosttrace|cut -d' ' -f$(($i+1)))\"/>" >> ${APPLICATIONTMP}
             
              echo "    <argument value=\"${sleeptime}\"/> <!-- delay -->" >> ${APPLICATIONTMP}
-            echo "  </process>" >> ${APPLICATIONTMP}
+            echo "  </actor>" >> ${APPLICATIONTMP}
              NUMPROCS=$(( ${NUMPROCS} +1))
          done
          # return IFS back to newline for "for" loop
              NUMPROCS=$(( ${NUMPROCS} +1))
          done
          # return IFS back to newline for "for" loop
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 e879f74557eece3f96a86ebfabf1561c900972c6..75266f9df732d7488bd14f575bfd805c48e4d28c 100644 (file)
--- a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
+++ b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
@@ -1,39 +1,39 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?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="Tremblay" function="master">
+<platform version="4.1">
+  <!-- The master actor (with some arguments) -->
+  <actor 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>
+  </actor>
    <!-- The slave processes (with mailbox to listen on as argument) -->
    <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">
+  <actor host="Tremblay" function="slave">
      <argument value="0"/>
      <argument value="0"/>
-  </process>
-  <process host="Ginette" function="master_mpi">
+  </actor>
+  <actor host="Ginette" function="master_mpi">
      <argument value="master_mpi"/>
      <argument value="0"/>
      <argument value="master_mpi"/>
      <argument value="0"/>
-  </process>
-  <process host="Bourassa" function="master_mpi">
+  </actor>
+  <actor host="Bourassa" function="master_mpi">
      <argument value="master_mpi"/>
      <argument value="1"/>
      <argument value="master_mpi"/>
      <argument value="1"/>
-  </process>
-  <process host="Ginette" function="alltoall_mpi">
+  </actor>
+  <actor host="Ginette" function="alltoall_mpi">
      <argument value="alltoall_mpi"/>
      <argument value="0"/>
      <argument value="alltoall_mpi"/>
      <argument value="0"/>
-  </process>
-  <process host="Bourassa" function="alltoall_mpi">
+  </actor>
+  <actor host="Bourassa" function="alltoall_mpi">
      <argument value="alltoall_mpi"/>
      <argument value="1"/>
      <argument value="alltoall_mpi"/>
      <argument value="1"/>
-  </process>
-  <process host="Jupiter" function="alltoall_mpi">
+  </actor>
+  <actor host="Jupiter" function="alltoall_mpi">
      <argument value="alltoall_mpi"/>
      <argument value="2"/>
      <argument value="alltoall_mpi"/>
      <argument value="2"/>
-  </process>
-  <process host="Fafard" function="alltoall_mpi">
+  </actor>
+  <actor host="Fafard" function="alltoall_mpi">
      <argument value="alltoall_mpi"/>
      <argument value="3"/>
      <argument value="alltoall_mpi"/>
      <argument value="3"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in

index ac444b70755736d024934dfdbaa2467679f454ac..a8c75e129079a623d0ab138d8c78b135454ab42f 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -323,7 +323,7 @@ if [ -z "${NUMPROCS}" ] ; then
  fi
  
  if [ ${NUMPROCS} -gt ${hostfile_procs} ] ; then
  fi
  
  if [ ${NUMPROCS} -gt ${hostfile_procs} ] ; then
-    echo "You requested to use ${NUMPROCS} processes, but there is only ${hostfile_procs} processes in your hostfile..." >&2
+    echo "You requested to use ${NUMPROCS} ranks, but there is only ${hostfile_procs} processes in your hostfile..." >&2
  fi
  
  ##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
  fi
  
  ##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
@@ -333,8 +333,8 @@ if [ -z "${PLATFORM}" ]; then
      cat > ${PLATFORMTMP} <<PLATFORMHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
      cat > ${PLATFORMTMP} <<PLATFORMHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS id="AS0" routing="Full">
+<platform version="4.1">
+<zone id="AS0" routing="Full">
  PLATFORMHEAD
  
      i=${NUMPROCS}
  PLATFORMHEAD
  
      i=${NUMPROCS}
@@ -360,7 +360,7 @@ PLATFORMHEAD
      done
  
      cat >> ${PLATFORMTMP} <<PLATFORMFOOT
      done
  
      cat >> ${PLATFORMTMP} <<PLATFORMFOOT
-</AS>
+</zone>
  </platform>
  PLATFORMFOOT
  
  </platform>
  PLATFORMFOOT
  
@@ -375,7 +375,7 @@ APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)"
  cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
  APPLICATIONHEAD
  
  ##---- cache hostnames of hostfile---------------
  APPLICATIONHEAD
  
  ##---- cache hostnames of hostfile---------------
@@ -415,7 +415,7 @@ fi
  
  set -- $hostnames
  
  
  set -- $hostnames
  
-##---- generate <process> tags------------------------------
+##---- generate <actor> tags------------------------------
  #prepare arguments at once
  for ARG in $PROC_ARGS; do
    XML_ARGS="${XML_ARGS}""<argument value=\"${ARG}\"/>
  #prepare arguments at once
  for ARG in $PROC_ARGS; do
    XML_ARGS="${XML_ARGS}""<argument value=\"${ARG}\"/>
@@ -427,12 +427,12 @@ do
      j=$(( $i % ${hostfile_procs} + 1 ))
      host=$(eval "echo \${$j}")
  
      j=$(( $i % ${hostfile_procs} + 1 ))
      host=$(eval "echo \${$j}")
  
-    ##---- optional display of ranks to process mapping
+    ##---- optional display of ranks to actor mapping
      if [ ${MAPOPT} = 1 ]; then
        echo "[rank $i] -> $host"
      fi
  
      if [ ${MAPOPT} = 1 ]; then
        echo "[rank $i] -> $host"
      fi
  
-    echo "  <process host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->
+    echo "  <actor host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->
      <argument value=\"1\"/> <!-- instance -->
      <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
      if [ ${REPLAY} = 1 ]; then
      <argument value=\"1\"/> <!-- instance -->
      <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
      if [ ${REPLAY} = 1 ]; then
@@ -444,7 +444,7 @@ do
      else 
      echo ${XML_ARGS} >> ${APPLICATIONTMP}
      fi
      else 
      echo ${XML_ARGS} >> ${APPLICATIONTMP}
      fi
-    echo "  </process>" >> ${APPLICATIONTMP}
+    echo "  </actor>" >> ${APPLICATIONTMP}
  done
  
  cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
  done
  
  cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd

index 13d2cc4ff69f4a3a82e1e14f7220ef7963f0699a..f2b787cf6da427291f1719b523c2b5be8053bfd8 100644 (file)
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -4,7 +4,7 @@
  More info: http://simgrid.gforge.inria.fr/simgrid/latest/doc/platform.html
  To upgrade your files, use the tool simgrid_update_xml
  
  More info: http://simgrid.gforge.inria.fr/simgrid/latest/doc/platform.html
  To upgrade your files, use the tool simgrid_update_xml
  
-* New in DTD version 5 (in SimGrid 3.16): backward compatible change (v4 files are valid v5 files)
+* New in DTD version 4.1 (in SimGrid 3.16): backward compatible change (v4 files are valid v4.1 files)
     - <zone> can be used as a synonym for the now deprecated <as>
     - <zoneZoute> an be used as a synonym for the now deprecated <asroute>
     - <bypassZoneRoute> an be used as a synonym for the now deprecated <bypassAsRoute>
     - <zone> can be used as a synonym for the now deprecated <as>
     - <zoneZoute> an be used as a synonym for the now deprecated <asroute>
     - <bypassZoneRoute> an be used as a synonym for the now deprecated <bypassAsRoute>
diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp

index 466f8d2aa64c825e7ee8eb79f0bc193ebbeac513..d59eeb052325e84d726f197cd2a62b94c850948e 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -446,16 +446,30 @@ void STag_surfxml_platform() {
        "Use simgrid_update_xml to update your file automatically. "
        "This program is installed automatically with SimGrid, or "
        "available in the tools/ directory of the source archive.");
        "Use simgrid_update_xml to update your file automatically. "
        "This program is installed automatically with SimGrid, or "
        "available in the tools/ directory of the source archive.");
-  xbt_assert((version >= 4.0), "******* FILE %s IS TOO OLD (v:%.1f) *********\n "
-      "Changes introduced in SimGrid 3.13:\n"
-      "  - 'power' attribute of hosts (and others) got renamed to 'speed'.\n"
-      "  - In <trace_connect>, attribute kind=\"POWER\" is now kind=\"SPEED\".\n"
-      "  - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n"
-      "  - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)"
-      "\n\n"
-      "Use simgrid_update_xml to update your file automatically. "
-      "This program is installed automatically with SimGrid, or "
-      "available in the tools/ directory of the source archive.",surf_parsed_filename, version);
+  xbt_assert((version >= 4.0),
+             "******* FILE %s IS TOO OLD (v:%.1f) *********\n "
+             "Changes introduced in SimGrid 3.13:\n"
+             "  - 'power' attribute of hosts (and others) got renamed to 'speed'.\n"
+             "  - In <trace_connect>, attribute kind=\"POWER\" is now kind=\"SPEED\".\n"
+             "  - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n"
+             "  - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)"
+             "\n\n"
+             "Use simgrid_update_xml to update your file automatically. "
+             "This program is installed automatically with SimGrid, or "
+             "available in the tools/ directory of the source archive.",
+             surf_parsed_filename, version);
+  if (version < 4.1) {
+    XBT_INFO("You're using a v%.1f XML file (%s) while the current standard is v4.1 "
+             "That's fine, the new version is backward compatible. \n\n"
+             "Use simgrid_update_xml to update your file automatically. "
+             "This program is installed automatically with SimGrid, or "
+             "available in the tools/ directory of the source archive.",
+             version, surf_parsed_filename);
+  }
+  xbt_assert(version <= 4.1, "******* FILE %s COMES FROM THE FUTURE (v:%.1f) *********\n "
+                             "The most recent formalism that this version of SimGrid understands is v4.1.\n"
+                             "Please update your code, or use another, more adapted, file.",
+             surf_parsed_filename, version);
  
    sg_platf_begin();
  }
  
    sg_platf_begin();
  }
@@ -471,8 +485,8 @@ void STag_surfxml_host(){
  void STag_surfxml_prop()
  {
    if (ZONE_TAG) { // We need to retrieve the most recently opened zone
  void STag_surfxml_prop()
  {
    if (ZONE_TAG) { // We need to retrieve the most recently opened zone
-    XBT_DEBUG("Set Zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
-    simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id);
+    XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
+    simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_zone_id);
  
      netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
    }
  
      netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
    }
@@ -936,7 +950,7 @@ void ETag_surfxml_AS(){
  }
  void STag_surfxml_zone(){
    parse_after_config();
  }
  void STag_surfxml_zone(){
    parse_after_config();
-  ZONE_TAG                   = 1;
+  ZONE_TAG                 = 1;
    s_sg_platf_AS_cbarg_t AS = { A_surfxml_zone_id, (int)A_surfxml_zone_routing};
  
    sg_platf_new_AS_begin(&AS);
    s_sg_platf_AS_cbarg_t AS = { A_surfxml_zone_id, (int)A_surfxml_zone_routing};
  
    sg_platf_new_AS_begin(&AS);
@@ -950,7 +964,8 @@ void STag_surfxml_config(){
    xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
    XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
    if (_sg_cfg_init_status == 2) {
    xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
    XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
    if (_sg_cfg_init_status == 2) {
-    surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
+    surf_parse_error("All <config> tags must be given before any platform elements (such as <zone>, <host>, <cluster>, "
+                     "<link>, etc).");
    }
  }
  void ETag_surfxml_config(){
    }
  }
  void ETag_surfxml_config(){
diff --git a/teshsuite/mc/mutex-handling/mutex-handling_d.xml b/teshsuite/mc/mutex-handling/mutex-handling_d.xml

index f1325de94b4cfc44ef6768cd4ba7fb3f6fae5370..d6eb805e60fc095ac93c9d5d072310305fd2bf6a 100644 (file)
--- a/teshsuite/mc/mutex-handling/mutex-handling_d.xml
+++ b/teshsuite/mc/mutex-handling/mutex-handling_d.xml
@@ -1,11 +1,11 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="receiver"/>
-  <process host="Boivin" function="sender">
+<platform version="4.1">
+  <actor host="Tremblay" function="receiver"/>
+  <actor host="Boivin" function="sender">
      <argument value="X"/>
      <argument value="X"/>
-  </process>
-  <process host="Fafard" function="sender">
+  </actor>
+  <actor host="Fafard" function="sender">
      <argument value="Y"/>
      <argument value="Y"/>
-  </process>
+  </actor>
  </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 68c4ccc583fe3e4727f3ad7818cec2673adeb448..b761bdbf59d35f5c2ccb367e13fc67fda14bc973 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.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">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="0">
      <argument value="40"/>
      <argument value="1.0"/>
      <argument value="40"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml

index d12fc7b5988408d9813f720e82dad82efbc27f8b..aa093e31c0422381d55f1ca6b4e5b4b1e22739b3 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.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">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="0">
      <argument value="220"/>
      <argument value="1.0"/>
      <argument value="220"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml

index 6ae2f4ed7400dfbcae826a2bd04473900f59080d..a919a7395f9a409fabafe3ab7e0fe2ef8ddf3c55 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="10">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="10">
      <argument value="40"/>
      <argument value="1.0"/>
      <argument value="40"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml

index 4c9a178f853bf788a53d5ec6c358d9110f1c48b0..28c048a76889cb1a893794b8872edfb9a8f763d4 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="10">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="10">
      <argument value="260"/>
      <argument value="1.0"/>
      <argument value="260"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml

index 33087be338c873b62d544e3f65619352b8e4caa3..a6ee0c0d739d75a5aa050f50e0aea7b44c4952e2 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="20">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="20">
      <argument value="40"/>
      <argument value="1.0"/>
      <argument value="40"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml

index 028b9a1dd6c476aeca685433d265df5d46d135d0..2bf91a18aac1b6b4f0679a99a94558136cea6382 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="20">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="20">
      <argument value="140"/>
      <argument value="1.0"/>
      <argument value="140"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml

index 8beb1c23f3636e7c5768637b0f387e1457319358..cd8c9c05ee1593c69421c59ce9b0e803144a37ac 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="40">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="40">
      <argument value="40"/>
      <argument value="1.0"/>
      <argument value="40"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml

index c412fe1028268c66c7fe7bade9f8742cd100f8a9..4fd1842b552075ede3d19ba4f78b72217ca802eb 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="40">
+<platform version="4.1">
+  <actor host="Cpu B" function="test_trace" start_time="40">
      <argument value="260"/>
      <argument value="1.0"/>
      <argument value="260"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </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 b4a9f57a4135a96e0ca774021108031f707df206..4d2d81a49441b32e88f959d5a5d64895a912cb66 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
@@ -1,16 +1,16 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Cpu B" function="test_trace" start_time="30">
      <argument value="100"/>
      <argument value="1.0"/>
      <argument value="100"/>
      <argument value="1.0"/>
-  </process>
+  </actor>
  </platform>
  </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 504497c2864af95f5a73fb5a18c2ef0f762e948f..7de0dc62317fdb00f537bb8c4add5dc636822410 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
@@ -1,16 +1,16 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="10">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor 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">
+  </actor>
+  <actor host="Cpu B" function="test_trace" start_time="20">
      <argument value="120"/>
      <argument value="4.0"/>
      <argument value="120"/>
      <argument value="4.0"/>
-  </process>
+  </actor>
  </platform>
  </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 aaa2f6cf534de7c146b2da6ba17659a70655f734..b31e3cab725c2d58dd9fb9753739970a4253df82 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
+++ b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="10">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="Cpu B" function="test_trace" start_time="20">
      <argument value="70"/>
      <argument value="1.5"/>
      <argument value="70"/>
      <argument value="1.5"/>
-  </process>
+  </actor>
  </platform>
  </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 163924b2dba9a8267d025004abf406d384602051..004873453d9411a370cfb597168ef9f3c940d2cc 100644 (file)
--- a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
+++ b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
@@ -1,12 +1,12 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Cpu B" function="test_trace" start_time="10">
+<platform version="4.1">
+  <actor 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">
+  </actor>
+  <actor host="Cpu B" function="test_trace" start_time="10">
      <argument value="70"/>
      <argument value="1.5"/>
      <argument value="70"/>
      <argument value="1.5"/>
-  </process>
+  </actor>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh

index 6a28da60ad0055615dfaeb98fd77778ca98e5a0f..b45ef48654ed2ae7e28a5583d10a4b69558d19b0 100644 (file)
--- a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
+++ b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
@@ -1,11 +1,11 @@
  ! expect signal SIGABRT
  $ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
  > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
  ! expect signal SIGABRT
  $ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
  > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: ASroute gw_src='nod-cluster_router.cluster.us' does name a node.
+> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: zoneRoute gw_src='nod-cluster_router.cluster.us' does name a node.
  > [  0.000000] [0:maestro@] Exiting now
  
  ! expect signal SIGABRT
  $ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
  > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
  > [  0.000000] [0:maestro@] Exiting now
  
  ! expect signal SIGABRT
  $ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
  > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node.
+> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: zoneRoute gw_dst='neud-grappe_router.grappe.fr' does name a node.
  > [  0.000000] [0:maestro@] Exiting now
  > [  0.000000] [0:maestro@] Exiting now
diff --git a/teshsuite/simdag/is-router/is-router.tesh b/teshsuite/simdag/is-router/is-router.tesh

index 6039c371b39e92f2fedbb7d49cfe08b51f4b9040..80d0a67b51e0e55f514af535b55f4688f66ee233 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.tesh
+++ b/teshsuite/simdag/is-router/is-router.tesh
@@ -14,7 +14,6 @@ $ ${bindir:=.}/is-router ${srcdir}/teshsuite/simdag/platforms/test_of_is_router.
  >    - Seen: "host09". Type: host
  >    - Seen: "host10". Type: host
  > NetCards count: 21
  >    - Seen: "host09". Type: host
  >    - Seen: "host10". Type: host
  > NetCards count: 21
->    - Seen: "AS". Type: netzone
  >    - Seen: "AS0". Type: netzone
  >    - Seen: "AS1". Type: netzone
  >    - Seen: "AS2". Type: netzone
  >    - Seen: "AS0". Type: netzone
  >    - Seen: "AS1". Type: netzone
  >    - Seen: "AS2". Type: netzone
@@ -35,3 +34,4 @@ $ ${bindir:=.}/is-router ${srcdir}/teshsuite/simdag/platforms/test_of_is_router.
  >    - Seen: "router3". Type: router
  >    - Seen: "router4". Type: router
  >    - Seen: "router5". Type: router
  >    - Seen: "router3". Type: router
  >    - Seen: "router4". Type: router
  >    - Seen: "router5". Type: router
+>    - Seen: "zone". Type: netzone
diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml

index d04c636bcf2418ac15e722ed5db10f6088453c6e..cf18d7b06d4b4c466ad2fc7bc4e9427734634ed5 100644 (file)
--- a/teshsuite/simdag/platforms/Dijkstra.xml
+++ b/teshsuite/simdag/platforms/Dijkstra.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Dijkstra">
+<platform version="4.1">
+  <zone id="AS0" routing="Dijkstra">
      <host id="NODO01" speed="10Mf"/>
      <host id="NODO02" speed="10Mf"/>
  
      <host id="NODO01" speed="10Mf"/>
      <host id="NODO02" speed="10Mf"/>
  
@@ -32,5 +32,5 @@
        <link_ctn id="11"/>
        <link_ctn id="12"/>
      </route>
        <link_ctn id="11"/>
        <link_ctn id="12"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml

index d038fc1a4f50de22d926777a983800fbc288908a..d13d47015dfaa7c10ee6591eceb19a73e041c9e4 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@ -1,9 +1,9 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- THIS FILE IS INVALID.
         It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->
    <!-- THIS FILE IS INVALID.
         It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
      <storage_type id="single_HDD" model="SSD" size="4kB">
        <model_prop id="Bwrite" value="30MBps" />
        <model_prop id="Bread" value="100MBps" />
      <storage_type id="single_HDD" model="SSD" size="4kB">
        <model_prop id="Bwrite" value="30MBps" />
        <model_prop id="Bread" value="100MBps" />
@@ -15,5 +15,5 @@
      <host id="client" speed="1Gf">
        <mount storageId="cdisk" name="/sd1" />
      </host>
      <host id="client" speed="1Gf">
        <mount storageId="cdisk" name="/sd1" />
      </host>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml

index d297f04c3faf0f7d8aa6588d0b851436c0274fc3..c754f89d4947c2e0d8257a56674dded1d81bfb55 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
@@ -1,18 +1,18 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="World" routing="Full">
-    <AS id="us" routing="Full">
+<platform version="4.1">
+  <zone id="World" routing="Full">
+    <zone 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">
+    </zone>
+    <zone 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>
+    </zone>
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
  
  
      <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">
+    <zoneRoute 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>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml

index b935300e5e22eb0d20f7471a2cc36d77ca6a085f..8de74a878235065b377e0d8ef138e77a6a56d12d 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
@@ -1,18 +1,18 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="World" routing="Full">
-    <AS id="us" routing="Full">
+<platform version="4.1">
+  <zone id="World" routing="Full">
+    <zone 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">
+    </zone>
+    <zone 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>
+    </zone>
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
  
  
      <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">
+    <zoneRoute 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>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml

index ec5230632ab559c1a33e425bdb88605fb409f09a..34eb3f27b6df100b9008d4cbb130fc6156945f73 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
@@ -1,10 +1,10 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <!-- 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) -->
    <!-- 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">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
@@ -17,5 +17,5 @@
      <route src="alice" dst="bob">
        <link_ctn id="link2"/>
      </route>
      <route src="alice" dst="bob">
        <link_ctn id="link2"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml

index 3e851a68a2821d9c365cfb8879882cec19b02fc0..eaa710ad7ad9134b2a9e48ce282cfc5e07d1d7d5 100644 (file)
--- a/teshsuite/simdag/platforms/four_hosts_floyd.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Floyd">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Floyd">
      <host id="host1" speed="1Gf"/>
      <host id="host2" speed="1Gf"/>
      <host id="host3" speed="1Gf"/>
      <host id="host1" speed="1Gf"/>
      <host id="host2" speed="1Gf"/>
      <host id="host3" speed="1Gf"/>
@@ -24,5 +24,5 @@
      <route src="host3" dst="host4">
        <link_ctn id="link4"/>
      </route>
      <route src="host3" dst="host4">
        <link_ctn id="link4"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/host_attributes.xml b/teshsuite/simdag/platforms/host_attributes.xml

index b0d28e06743cd9ba44eaef177929de753dc755fd..daedebb2df2e0394e84b716b08b2e518e9df62d9 100644 (file)
--- a/teshsuite/simdag/platforms/host_attributes.xml
+++ b/teshsuite/simdag/platforms/host_attributes.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="alice" speed="1Gf"/> <!-- connected to an in-file speed trace --> 
      <host id="bob" speed="1Gf"/>   <!-- connected to an out-file speed trace -->
      <host id="carol" speed="500Mf" state_file="carol.fail"/>  <!-- out-file state trace as attribute -->
      <host id="alice" speed="1Gf"/> <!-- connected to an in-file speed trace --> 
      <host id="bob" speed="1Gf"/>   <!-- connected to an out-file speed trace -->
      <host id="carol" speed="500Mf" state_file="carol.fail"/>  <!-- out-file state trace as attribute -->
@@ -11,7 +11,7 @@
        <prop id="OS" value="Linux 2.6.22-14"/>
      </host>
      <host id="erin" speed="500Mf" availability_file="erin.avail"/> <!--uses someone else's trace --> 
        <prop id="OS" value="Linux 2.6.22-14"/>
      </host>
      <host id="erin" speed="500Mf" availability_file="erin.avail"/> <!--uses someone else's trace --> 
-  </AS>
+  </zone>
  
    <trace id="myTrace" periodicity="1.0">
      0.0 1.0
  
    <trace id="myTrace" periodicity="1.0">
      0.0 1.0
diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/simdag/platforms/link_attributes.xml

index 62bc33dcc8fe1fdf52ee4bb69e266d79117e4cfc..9e037aec7e145ebcd66a2acce70382690ef5d2d8 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml

index 29c7984a7b3003e237952949da473efbd9a70708..fc8e1cdc42df4cf9f14a31de738c1652c3978025 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml

index d998894386bdf93ffdc7f1ddfcdba15e5ba80538..c44fa11ea7b1661aed6f37d43dbb46eb2aa7be5f 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/simdag/platforms/one_cluster_multicore.xml

index 18de9474b303c5125988d75292df3f3ce5ceb91f..7c1d08eea53f3bede338685877e823c7b51e0985 100644 (file)
--- a/teshsuite/simdag/platforms/one_cluster_multicore.xml
+++ b/teshsuite/simdag/platforms/one_cluster_multicore.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
      <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" core="6" bw="125MBps" lat="50us"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml

index 3682739d332c5bf1d2692f0e827e2235bf5f936d..fa52d2bd3e75e71c95ce3a29ebf601c1611f6b6b 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">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone 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"/>
      <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>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_2p_1bb.xml b/teshsuite/simdag/platforms/platform_2p_1bb.xml

index d996cbcc8419ba232be425df1986d0bcb4c5b342..fc9eae42c8ab65b0f686301201c541bbf8c31fc5 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1bb.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1bb.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
@@ -13,5 +13,5 @@
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml

index 12d217454ef322b7af2a2ebf058ee927dca3f564..9f76670b84f1b4613942c1795eea8aa20912275d 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1fl.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1fl.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
@@ -10,5 +10,5 @@
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml

index ed3396e407b245288ad2036ba4523e42e9e18206..bc4740ac2ea1c16130f0a65099e4d36c20a17c69 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1sl.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1sl.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
@@ -10,5 +10,5 @@
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml

index c0d1e783400bd6eeb9f2224de7a5e1f21f190853..db1e5b8da60da1715ccf9f2049dbfcfd749cde7e 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="cpu0" speed="1f" />
      <host id="cpu1" speed="2f" />
  
      <host id="cpu0" speed="1f" />
      <host id="cpu1" speed="2f" />
  
@@ -10,5 +10,5 @@
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0" />
      </route>
      <route src="cpu0" dst="cpu1">
        <link_ctn id="link0" />
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml

index 34286fc98d27b077fb1d19420b2edebe5993a98e..2082b8ae9faa0797c132ed30bfe762aca02a5b96 100644 (file)
--- a/teshsuite/simdag/platforms/platform_2p_1switch.xml
+++ b/teshsuite/simdag/platforms/platform_2p_1switch.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
  
@@ -14,5 +14,5 @@
        <link_ctn id="switch"/>
        <link_ctn id="link1"/>
      </route>
        <link_ctn id="switch"/>
        <link_ctn id="link1"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml

index e14dbf1e24d9af8f4bc733e54be0f6e25fc7740c..bc4167930b76f230110a5035a7d6ed3a2f2ab442 100644 (file)
--- a/teshsuite/simdag/platforms/platform_4p_1switch.xml
+++ b/teshsuite/simdag/platforms/platform_4p_1switch.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
      <host id="cpu2" speed="1f"/>
      <host id="cpu0" speed="1f"/>
      <host id="cpu1" speed="1f"/>
      <host id="cpu2" speed="1f"/>
@@ -43,5 +43,5 @@
        <link_ctn id="switch"/>
        <link_ctn id="link3"/>
      </route>
        <link_ctn id="switch"/>
        <link_ctn id="link3"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml

index d73a133809a2ecb9617aaa2a7578bc35f5e92e7e..fa5cede5b9e3dd2d57846438bece819923f93447 100644 (file)
--- a/teshsuite/simdag/platforms/platform_include.xml
+++ b/teshsuite/simdag/platforms/platform_include.xml
@@ -1,8 +1,8 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="main" routing="Full">
+<platform version="4.1">
+  <zone id="main" routing="Full">
      <include file="clusterA.xml"/>
      <include file="clusterB.xml"/>
      <include file="clusterA.xml"/>
      <include file="clusterB.xml"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml

index 28dfd08334987d1c6f2d3502460ebb0ecc71907d..d1d276034b10910454c8557fc6870a0724c56772 100644 (file)
--- a/teshsuite/simdag/platforms/properties.xml
+++ b/teshsuite/simdag/platforms/properties.xml
@@ -1,6 +1,6 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
    <config id="General">
      <prop id="maxmin/precision" value="0.000010"/>
      <prop id="cpu/optim" value="TI"/>
    <config id="General">
      <prop id="maxmin/precision" value="0.000010"/>
      <prop id="cpu/optim" value="TI"/>
@@ -8,7 +8,7 @@
      <prop id="network/model" value="Vegas"/>
      <prop id="path" value="~/"/>
    </config>
      <prop id="network/model" value="Vegas"/>
      <prop id="path" value="~/"/>
    </config>
-  <AS  id="AS0"  routing="Full">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="500Mf"/>
      <host id="bob" speed="500Mf"/>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml

index 70d10ce573e7e0bc4802e3c90a3d616021ffd8e4..c20f45e6bd41cea245bcf653a72dae4ef28f191a 100644 (file)
--- a/teshsuite/simdag/platforms/test_of_is_router.xml
+++ b/teshsuite/simdag/platforms/test_of_is_router.xml
@@ -1,31 +1,31 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS"  routing="Full">
-    <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="zone"  routing="Full">
+    <zone  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">
+    </zone>
+    <zone  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">
+    </zone>
+    <zone  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">
+    </zone>
+    <zone  id="AS3"  routing="DijkstraCache">
        <host id="host07" speed="1Gf"/>
        <host id="host08" speed="500Mf"/>
        <router id="router4"/>
        <host id="host07" speed="1Gf"/>
        <host id="host08" speed="500Mf"/>
        <router id="router4"/>
-    </AS>
-    <AS  id="AS4"  routing="None">
+    </zone>
+    <zone  id="AS4"  routing="None">
        <host id="host09" speed="1Gf"/>
        <host id="host10" speed="500Mf"/>
        <router id="router5"/>
        <host id="host09" speed="1Gf"/>
        <host id="host10" speed="500Mf"/>
        <router id="router5"/>
-    </AS>
-  </AS>
+    </zone>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml

index b37590cff35e5a17e249d34f80bc08aa830f16bc..e34b4929971dca852fc24446bd70eb6c62e0cf65 100644 (file)
--- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
+++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
      <host id="trudy" speed="250Mf"/>
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
      <host id="trudy" speed="250Mf"/>
@@ -23,5 +23,5 @@
      <route src="trudy" dst="alice">
        <link_ctn id="link3"/>
      </route>
      <route src="trudy" dst="alice">
        <link_ctn id="link3"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml

index 962dbd7f864e8f6613826c319df02e26e3d55189..afd0e811144185dd4f182c273535f99af1502887 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" 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"
      <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" 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"
@@ -9,9 +9,9 @@
  
      <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" 
+    <zoneRoute src="bob_cluster" dst="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu" 
               gw_dst="alicealice_cluster_router.crepe.fr">
        <link_ctn id="backbone"/>
               gw_dst="alicealice_cluster_router.crepe.fr">
        <link_ctn id="backbone"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml

index 0625fd317f6063bee9edaf783d8923b7b6b38921..dc50aa110bf2490608cac819f0d75cef8aac7f07 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters_one_name.xml
+++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone id="AS0"  routing="Full">
      <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
               bb_bw="2.25GBps" bb_lat="500us"/>
  
      <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
               bb_bw="2.25GBps" bb_lat="500us"/>
  
@@ -10,9 +10,9 @@
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
  
  
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
  
-    <ASroute src="bob_cluster" dst="bob_cluster_1" gw_src="bobbob_cluster_router.hamburger.edu" 
+    <zoneRoute src="bob_cluster" dst="bob_cluster_1" gw_src="bobbob_cluster_router.hamburger.edu" 
               gw_dst="bobbob_cluster_1_router.hamburger.edu">
        <link_ctn id="backbone"/>
               gw_dst="bobbob_cluster_1_router.hamburger.edu">
        <link_ctn id="backbone"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml

index b6cd8620db813e4be92ab67a9edd7065de085d8c..43d4e46243b6d8714793976ff1b85c85eb946775 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters_router_id.xml
+++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  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"
      <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"
@@ -9,11 +9,11 @@
  
      <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">
+    <zoneRoute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
        <link_ctn id="backbone"/>
        <link_ctn id="backbone"/>
-    </ASroute>
-    <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
+    </zoneRoute>
+    <zoneRoute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
        <link_ctn id="backbone"/>
        <link_ctn id="backbone"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml

index 15a3b024b35acc3a6c4847bd7fe0d269ada8e001..bb440446fd67f5df2a85e3ba71d5e3287947921d 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
@@ -14,5 +14,5 @@
        <link_ctn id="switch"/>
        <link_ctn id="link_alice"/>
      </route>
        <link_ctn id="switch"/>
        <link_ctn id="link_alice"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml

index 56e7e4b174dca2f28d0dce914cf00823b47b04de..afef580b6eacfca63cc493490fce7d2c769cc70f 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
@@ -10,5 +10,5 @@
      <route src="bob" dst="alice">
        <link_ctn id="link1"/>
      </route>
      <route src="bob" dst="alice">
        <link_ctn id="link1"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml

index 515fd537bc189eaf07f7c0edc666930414dd798d..750ac91e1256648b2af2b33b35e347525651b379 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
@@ -1,7 +1,7 @@
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
  <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
      <host id="bob" speed="1Gf"/>
      <host id="alice" speed="500Mf"/>
  
@@ -13,5 +13,5 @@
      <route src="bob" dst="alice" symmetrical="NO">
        <link_ctn id="link1" direction="DOWN"/>
      </route>
      <route src="bob" dst="alice" symmetrical="NO">
        <link_ctn id="link1" direction="DOWN"/>
      </route>
-  </AS>
+  </zone>
  </platform>
  </platform>
diff --git a/teshsuite/smpi/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh

index 728b8f3a43c16f58d7f64cbf9acfaf1912bb91cb..597628b9b82545cbb43021c1f912be4bc4a9f2b1 100644 (file)
--- a/teshsuite/smpi/bug-17132/bug-17132.tesh
+++ b/teshsuite/smpi/bug-17132/bug-17132.tesh
@@ -1,3 +1,3 @@
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 16 -platform ../../../examples/platforms/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/simulate-computation:no --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 16 -platform ../../../examples/platforms/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/simulate-computation:no --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> You requested to use 16 processes, but there is only 5 processes in your hostfile...
+> You requested to use 16 ranks, but there is only 5 processes in your hostfile...
  > Walltime = 0.468274
  > Walltime = 0.468274
diff --git a/teshsuite/smpi/privatization/privatization.tesh b/teshsuite/smpi/privatization/privatization.tesh

index 60a4c6d0718ebab9f216e77f9b3841fc13aa5f60..42d8bf3ec7d4761f39214ec9e05c1885c79cac2f 100644 (file)
--- a/teshsuite/smpi/privatization/privatization.tesh
+++ b/teshsuite/smpi/privatization/privatization.tesh
@@ -2,4 +2,4 @@ p Test privatization
  ! setenv LD_LIBRARY_PATH=../../lib
  ! timeout 5
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:1 --log=simix_context.thres:error
  ! setenv LD_LIBRARY_PATH=../../lib
  ! timeout 5
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:1 --log=simix_context.thres:error
-> You requested to use 32 processes, but there is only 5 processes in your hostfile...
+> You requested to use 32 ranks, but there is only 5 processes in your hostfile...
diff --git a/teshsuite/smpi/privatization/privatization_dlopen.tesh b/teshsuite/smpi/privatization/privatization_dlopen.tesh

index 82551884a980778779c9273ffadf1d5ee0eae19f..ced2221baeb51d2811a4e875d8ea21b4d5281ee7 100644 (file)
--- a/teshsuite/smpi/privatization/privatization_dlopen.tesh
+++ b/teshsuite/smpi/privatization/privatization_dlopen.tesh
@@ -2,4 +2,4 @@ p Test privatization with dlopen
  ! setenv LD_LIBRARY_PATH=../../lib
  ! timeout 5
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:dlopen --log=simix_context.thres:error
  ! setenv LD_LIBRARY_PATH=../../lib
  ! timeout 5
  $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:dlopen --log=simix_context.thres:error
-> You requested to use 32 processes, but there is only 5 processes in your hostfile...
+> You requested to use 32 ranks, but there is only 5 processes in your hostfile...
diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl

index a67fcab931d3717f05eb0f2a4541e3d9e2e0bc0c..006c1d7758834b46c756bbd87dfcc8c5671c81e1 100755 (executable)
--- a/tools/simgrid_update_xml.pl
+++ b/tools/simgrid_update_xml.pl
@@ -87,7 +87,7 @@ Several tags were renamed (for sake of XML sanity):
  
  =back
  
  
  =back
  
-=item B<Version 4:> Introduced in SimGrid 3.13 (this is the current version)
+=item B<Version 4:> Introduced in SimGrid 3.13
  
  =over 4
  
  
  =over 4
  
@@ -123,6 +123,21 @@ Units are now mandatory in attributes. USE THE SCRIPT sg_xml_unit_converter.py T
  
  =back
  
  
  =back
  
+=item B<Version 4.1:> Introduced in SimGrid 3.16 (this is the current version)
+
+=over 4
+
+=item
+
+Rename a few tags, but in a backward-compatible manner: the old names are still accepted.
+
+  AS            -> zone
+  ASroute       -> zoneRoute
+  bypassAsRoute -> bypassZoneRoute
+  process       -> actor
+
+=back
+
  =back
  
  =head1 AUTHORS
  =back
  
  =head1 AUTHORS
@@ -142,7 +157,7 @@ under the terms of GNU LGPL (v2.1) license.
  use strict;
  
  my $fromversion=-1;
  use strict;
  
  my $fromversion=-1;
-my $toversion=4;
+my $toversion=4.1;
  
  my $filename = $ARGV[0] or die "Usage: simgrid_update_xml.pl file_to_convert.xml\nPlease provide an XML to convert as a parameter.\n";
  open INPUT, "$filename" or die "Cannot open input file $filename: $!\n";
  
  my $filename = $ARGV[0] or die "Usage: simgrid_update_xml.pl file_to_convert.xml\nPlease provide an XML to convert as a parameter.\n";
  open INPUT, "$filename" or die "Cannot open input file $filename: $!\n";
@@ -164,10 +179,10 @@ while (defined($line = <INPUT>)) {
         $fromversion = 0;
         print "$filename was using version 0\n";
         next if !$line =~ /\S/;
         $fromversion = 0;
         print "$filename was using version 0\n";
         next if !$line =~ /\S/;
-    } elsif ($line =~ s/<platform.*version=["']*([0-9.])["']*>//) {
+    } elsif ($line =~ s/<platform.*version=["']*([0-9.]*)["']*>//) {
         $fromversion = $1;
         if ($fromversion == $toversion) {
         $fromversion = $1;
         if ($fromversion == $toversion) {
-           die "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n";
+           warn "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n";
         }
         if ($fromversion > $toversion) {
             die "Input platform file $filename is more recent than this script (file version: $fromversion; script version: $toversion)\n";
         }
         if ($fromversion > $toversion) {
             die "Input platform file $filename is more recent than this script (file version: $fromversion; script version: $toversion)\n";
@@ -225,6 +240,12 @@ while (defined($line = <INPUT>)) {
         $line =~ s/\bpower\b/speed/g;   
         $line =~ s/\bkind="POWER"/kind="SPEED"/g;
      }
         $line =~ s/\bpower\b/speed/g;   
         $line =~ s/\bkind="POWER"/kind="SPEED"/g;
      }
+    if ($fromversion < 4.1) {
+       $line =~ s/\bAS\b/zone/g;
+       $line =~ s/\bASroute\b/zoneRoute/g;
+       $line =~ s/\bbypassAsRoute\b/bypassZoneRoute/g;
+       $line =~ s/\bprocess\b/actor/g;
+    }
         
      $output_string .= "$line\n";
  }
         
      $output_string .= "$line\n";
  }
author	Martin Quinson <martin.quinson@loria.fr>
	Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
committer	Martin Quinson <martin.quinson@loria.fr>
	Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
doc/msg-tuto-src/deployment0.xml		patch \| blob \| history
doc/msg-tuto-src/deployment1.xml		patch \| blob \| history
doc/msg-tuto-src/deployment2.xml		patch \| blob \| history
doc/msg-tuto-src/deployment3.xml		patch \| blob \| history
doc/msg-tuto-src/deployment_general.xml		patch \| blob \| history
examples/java/app/bittorrent/bittorrent.xml		patch \| blob \| history
examples/java/app/centralizedmutex/centralizedmutex.xml		patch \| blob \| history
examples/java/app/masterworker/masterworker.xml		patch \| blob \| history
examples/java/dht/chord/chord.xml		patch \| blob \| history
examples/java/dht/kademlia/kademlia.xml		patch \| blob \| history
examples/java/process/startkilltime/startkilltime.xml		patch \| blob \| history
examples/java/task/priority/priority.xml		patch \| blob \| history
examples/msg/actions-comm/actions-comm_d.xml		patch \| blob \| history
examples/msg/actions-comm/actions-comm_split_d.xml		patch \| blob \| history
examples/msg/actions-storage/actions-storage_d.xml		patch \| blob \| history
examples/msg/app-bittorrent/app-bittorrent_d.xml		patch \| blob \| history
examples/msg/app-chainsend/app-chainsend_d.xml		patch \| blob \| history
examples/msg/app-masterworker/app-masterworker-multicore_d.xml		patch \| blob \| history
examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml		patch \| blob \| history
examples/msg/app-masterworker/app-masterworker_d.xml		patch \| blob \| history
examples/msg/app-pingpong/app-pingpong_d.xml		patch \| blob \| history
examples/msg/async-wait/async-wait2_d.xml		patch \| blob \| history
examples/msg/async-wait/async-wait3_d.xml		patch \| blob \| history
examples/msg/async-wait/async-wait4_d.xml		patch \| blob \| history
examples/msg/async-wait/async-wait_d.xml		patch \| blob \| history
examples/msg/async-waitall/async-waitall_d.xml		patch \| blob \| history
examples/msg/async-waitany/async-waitany_d.xml		patch \| blob \| history
examples/msg/async-yield/async-yield_d.xml		patch \| blob \| history
examples/msg/dht-chord/dht-chord_d.xml		patch \| blob \| history
examples/msg/dht-kademlia/dht-kademlia_d.xml		patch \| blob \| history
examples/msg/energy-onoff/platform_onoff.xml		patch \| blob \| history
examples/msg/io-remote/io-remote_d.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged1.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged1_liveness.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged1_liveness_visited.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged2.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged2_liveness.xml		patch \| blob \| history
examples/msg/mc/deploy_bugged3.xml		patch \| blob \| history
examples/msg/mc/deploy_centralized_mutex.xml		patch \| blob \| history
examples/msg/mc/deploy_electric_fence.xml		patch \| blob \| history
examples/msg/mc/platform.xml		patch \| blob \| history
examples/msg/network-ns3/3hosts_2links_d.xml		patch \| blob \| history
examples/msg/network-ns3/3links-timer_d.xml		patch \| blob \| history
examples/msg/network-ns3/3links_d.xml		patch \| blob \| history
examples/msg/network-ns3/crosstraffic_d.xml		patch \| blob \| history
examples/msg/network-ns3/dogbone_d.xml		patch \| blob \| history
examples/msg/network-ns3/one_cluster_d.xml		patch \| blob \| history
examples/msg/network-ns3/onelink_d.xml		patch \| blob \| history
examples/msg/network-ns3/two_clusters_d.xml		patch \| blob \| history
examples/msg/platform-properties/platform-properties_d.xml		patch \| blob \| history
examples/msg/process-startkilltime/baseline_d.xml		patch \| blob \| history
examples/msg/process-startkilltime/kill_d.xml		patch \| blob \| history
examples/msg/process-startkilltime/start_d.xml		patch \| blob \| history
examples/msg/process-startkilltime/start_kill_d.xml		patch \| blob \| history
examples/msg/task-priority/task-priority_d.xml		patch \| blob \| history
examples/platforms/bypassASroute.xml		patch \| blob \| history
examples/platforms/bypassRoute.xml		patch \| blob \| history
examples/platforms/cloud.xml		patch \| blob \| history
examples/platforms/cluster.xml		patch \| blob \| history
examples/platforms/cluster_and_one_host.xml		patch \| blob \| history
examples/platforms/cluster_dragonfly.xml		patch \| blob \| history
examples/platforms/cluster_fat_tree.xml		patch \| blob \| history
examples/platforms/cluster_no_backbone.xml		patch \| blob \| history
examples/platforms/cluster_torus.xml		patch \| blob \| history
examples/platforms/config.xml		patch \| blob \| history
examples/platforms/config_tracing.xml		patch \| blob \| history
examples/platforms/crosstraffic.xml		patch \| blob \| history
examples/platforms/data_center.xml		patch \| blob \| history
examples/platforms/dogbone.xml		patch \| blob \| history
examples/platforms/energy_cluster.xml		patch \| blob \| history
examples/platforms/energy_platform.xml		patch \| blob \| history
examples/platforms/faulty_host.xml		patch \| blob \| history
examples/platforms/g5k.xml		patch \| blob \| history
examples/platforms/griffon.xml		patch \| blob \| history
examples/platforms/meta_cluster.xml		patch \| blob \| history
examples/platforms/multicore_machine.xml		patch \| blob \| history
examples/platforms/onelink.xml		patch \| blob \| history
examples/platforms/prop.xml		patch \| blob \| history
examples/platforms/routing_cluster.xml		patch \| blob \| history
examples/platforms/routing_none.xml		patch \| blob \| history
examples/platforms/simulacrum_7_hosts.xml		patch \| blob \| history
examples/platforms/small_platform.xml		patch \| blob \| history
examples/platforms/small_platform_fatpipe.xml		patch \| blob \| history
examples/platforms/small_platform_one_link_routes.xml		patch \| blob \| history
examples/platforms/small_platform_with_failures.xml		patch \| blob \| history
examples/platforms/small_platform_with_routers.xml		patch \| blob \| history
examples/platforms/storage/remote_io.xml		patch \| blob \| history
examples/platforms/storage/storage.xml		patch \| blob \| history
examples/platforms/three_multicore_hosts.xml		patch \| blob \| history
examples/platforms/two_clusters.xml		patch \| blob \| history
examples/platforms/two_hosts.xml		patch \| blob \| history
examples/platforms/two_hosts_platform_shared.xml		patch \| blob \| history
examples/platforms/two_hosts_platform_with_availability.xml		patch \| blob \| history
examples/platforms/two_hosts_platform_with_availability_included.xml		patch \| blob \| history
examples/platforms/two_peers.xml		patch \| blob \| history
examples/platforms/vivaldi.xml		patch \| blob \| history
examples/s4u/actions-comm/s4u_actions-comm_d.xml		patch \| blob \| history
examples/s4u/actions-comm/s4u_actions-comm_split_d.xml		patch \| blob \| history
examples/s4u/actions-storage/s4u_actions-storage_d.xml		patch \| blob \| history
examples/s4u/actor-create/s4u_actor-create_d.xml		patch \| blob \| history
examples/s4u/app-masterworker/s4u_app-masterworker_d.xml		patch \| blob \| history
examples/s4u/dht-chord/s4u_dht-chord_d.xml		patch \| blob \| history
examples/smpi/replay_multiple/generate_multiple_deployment.sh		patch \| blob \| history
examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml		patch \| blob \| history
src/smpi/smpirun.in		patch \| blob \| history
src/surf/xml/simgrid.dtd		patch \| blob \| history
src/surf/xml/surfxml_sax_cb.cpp		patch \| blob \| history
teshsuite/mc/mutex-handling/mutex-handling_d.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml		patch \| blob \| history
teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml		patch \| blob \| history
teshsuite/simdag/flatifier/bogus_missing_gateway.tesh		patch \| blob \| history
teshsuite/simdag/is-router/is-router.tesh		patch \| blob \| history
teshsuite/simdag/platforms/Dijkstra.xml		patch \| blob \| history
teshsuite/simdag/platforms/bogus_disk_attachment.xml		patch \| blob \| history
teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml		patch \| blob \| history
teshsuite/simdag/platforms/bogus_missing_src_gateway.xml		patch \| blob \| history
teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml		patch \| blob \| history
teshsuite/simdag/platforms/four_hosts_floyd.xml		patch \| blob \| history
teshsuite/simdag/platforms/host_attributes.xml		patch \| blob \| history
teshsuite/simdag/platforms/link_attributes.xml		patch \| blob \| history
teshsuite/simdag/platforms/one_cluster.xml		patch \| blob \| history
teshsuite/simdag/platforms/one_cluster_fullduplex.xml		patch \| blob \| history
teshsuite/simdag/platforms/one_cluster_multicore.xml		patch \| blob \| history
teshsuite/simdag/platforms/one_cluster_router_id.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_2p_1bb.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_2p_1fl.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_2p_1sl.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_2p_1switch.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_4p_1switch.xml		patch \| blob \| history
teshsuite/simdag/platforms/platform_include.xml		patch \| blob \| history
teshsuite/simdag/platforms/properties.xml		patch \| blob \| history
teshsuite/simdag/platforms/test_of_is_router.xml		patch \| blob \| history
teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_clusters.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_clusters_one_name.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_clusters_router_id.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_hosts_multi_hop.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_hosts_one_link.xml		patch \| blob \| history
teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml		patch \| blob \| history
teshsuite/smpi/bug-17132/bug-17132.tesh		patch \| blob \| history
teshsuite/smpi/privatization/privatization.tesh		patch \| blob \| history
teshsuite/smpi/privatization/privatization_dlopen.tesh		patch \| blob \| history
tools/simgrid_update_xml.pl		patch \| blob \| history