Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Update all our XML files + next XML version will be 4.1, not 5
authorMartin Quinson <martin.quinson@loria.fr>
Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 5 May 2017 20:13:55 +0000 (22:13 +0200)
154 files changed:
doc/msg-tuto-src/deployment0.xml
doc/msg-tuto-src/deployment1.xml
doc/msg-tuto-src/deployment2.xml
doc/msg-tuto-src/deployment3.xml
doc/msg-tuto-src/deployment_general.xml
examples/java/app/bittorrent/bittorrent.xml
examples/java/app/centralizedmutex/centralizedmutex.xml
examples/java/app/masterworker/masterworker.xml
examples/java/dht/chord/chord.xml
examples/java/dht/kademlia/kademlia.xml
examples/java/process/startkilltime/startkilltime.xml
examples/java/task/priority/priority.xml
examples/msg/actions-comm/actions-comm_d.xml
examples/msg/actions-comm/actions-comm_split_d.xml
examples/msg/actions-storage/actions-storage_d.xml
examples/msg/app-bittorrent/app-bittorrent_d.xml
examples/msg/app-chainsend/app-chainsend_d.xml
examples/msg/app-masterworker/app-masterworker-multicore_d.xml
examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml
examples/msg/app-masterworker/app-masterworker_d.xml
examples/msg/app-pingpong/app-pingpong_d.xml
examples/msg/async-wait/async-wait2_d.xml
examples/msg/async-wait/async-wait3_d.xml
examples/msg/async-wait/async-wait4_d.xml
examples/msg/async-wait/async-wait_d.xml
examples/msg/async-waitall/async-waitall_d.xml
examples/msg/async-waitany/async-waitany_d.xml
examples/msg/async-yield/async-yield_d.xml
examples/msg/dht-chord/dht-chord_d.xml
examples/msg/dht-kademlia/dht-kademlia_d.xml
examples/msg/energy-onoff/platform_onoff.xml
examples/msg/io-remote/io-remote_d.xml
examples/msg/mc/deploy_bugged1.xml
examples/msg/mc/deploy_bugged1_liveness.xml
examples/msg/mc/deploy_bugged1_liveness_visited.xml
examples/msg/mc/deploy_bugged2.xml
examples/msg/mc/deploy_bugged2_liveness.xml
examples/msg/mc/deploy_bugged3.xml
examples/msg/mc/deploy_centralized_mutex.xml
examples/msg/mc/deploy_electric_fence.xml
examples/msg/mc/platform.xml
examples/msg/network-ns3/3hosts_2links_d.xml
examples/msg/network-ns3/3links-timer_d.xml
examples/msg/network-ns3/3links_d.xml
examples/msg/network-ns3/crosstraffic_d.xml
examples/msg/network-ns3/dogbone_d.xml
examples/msg/network-ns3/one_cluster_d.xml
examples/msg/network-ns3/onelink_d.xml
examples/msg/network-ns3/two_clusters_d.xml
examples/msg/platform-properties/platform-properties_d.xml
examples/msg/process-startkilltime/baseline_d.xml
examples/msg/process-startkilltime/kill_d.xml
examples/msg/process-startkilltime/start_d.xml
examples/msg/process-startkilltime/start_kill_d.xml
examples/msg/task-priority/task-priority_d.xml
examples/platforms/bypassASroute.xml
examples/platforms/bypassRoute.xml
examples/platforms/cloud.xml
examples/platforms/cluster.xml
examples/platforms/cluster_and_one_host.xml
examples/platforms/cluster_dragonfly.xml
examples/platforms/cluster_fat_tree.xml
examples/platforms/cluster_no_backbone.xml
examples/platforms/cluster_torus.xml
examples/platforms/config.xml
examples/platforms/config_tracing.xml
examples/platforms/crosstraffic.xml
examples/platforms/data_center.xml
examples/platforms/dogbone.xml
examples/platforms/energy_cluster.xml
examples/platforms/energy_platform.xml
examples/platforms/faulty_host.xml
examples/platforms/g5k.xml
examples/platforms/griffon.xml
examples/platforms/meta_cluster.xml
examples/platforms/multicore_machine.xml
examples/platforms/onelink.xml
examples/platforms/prop.xml
examples/platforms/routing_cluster.xml
examples/platforms/routing_none.xml
examples/platforms/simulacrum_7_hosts.xml
examples/platforms/small_platform.xml
examples/platforms/small_platform_fatpipe.xml
examples/platforms/small_platform_one_link_routes.xml
examples/platforms/small_platform_with_failures.xml
examples/platforms/small_platform_with_routers.xml
examples/platforms/storage/remote_io.xml
examples/platforms/storage/storage.xml
examples/platforms/three_multicore_hosts.xml
examples/platforms/two_clusters.xml
examples/platforms/two_hosts.xml
examples/platforms/two_hosts_platform_shared.xml
examples/platforms/two_hosts_platform_with_availability.xml
examples/platforms/two_hosts_platform_with_availability_included.xml
examples/platforms/two_peers.xml
examples/platforms/vivaldi.xml
examples/s4u/actions-comm/s4u_actions-comm_d.xml
examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
examples/s4u/actions-storage/s4u_actions-storage_d.xml
examples/s4u/actor-create/s4u_actor-create_d.xml
examples/s4u/app-masterworker/s4u_app-masterworker_d.xml
examples/s4u/dht-chord/s4u_dht-chord_d.xml
examples/smpi/replay_multiple/generate_multiple_deployment.sh
examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
src/smpi/smpirun.in
src/surf/xml/simgrid.dtd
src/surf/xml/surfxml_sax_cb.cpp
teshsuite/mc/mutex-handling/mutex-handling_d.xml
teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
teshsuite/simdag/is-router/is-router.tesh
teshsuite/simdag/platforms/Dijkstra.xml
teshsuite/simdag/platforms/bogus_disk_attachment.xml
teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
teshsuite/simdag/platforms/four_hosts_floyd.xml
teshsuite/simdag/platforms/host_attributes.xml
teshsuite/simdag/platforms/link_attributes.xml
teshsuite/simdag/platforms/one_cluster.xml
teshsuite/simdag/platforms/one_cluster_fullduplex.xml
teshsuite/simdag/platforms/one_cluster_multicore.xml
teshsuite/simdag/platforms/one_cluster_router_id.xml
teshsuite/simdag/platforms/platform_2p_1bb.xml
teshsuite/simdag/platforms/platform_2p_1fl.xml
teshsuite/simdag/platforms/platform_2p_1sl.xml
teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
teshsuite/simdag/platforms/platform_2p_1switch.xml
teshsuite/simdag/platforms/platform_4p_1switch.xml
teshsuite/simdag/platforms/platform_include.xml
teshsuite/simdag/platforms/properties.xml
teshsuite/simdag/platforms/test_of_is_router.xml
teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
teshsuite/simdag/platforms/two_clusters.xml
teshsuite/simdag/platforms/two_clusters_one_name.xml
teshsuite/simdag/platforms/two_clusters_router_id.xml
teshsuite/simdag/platforms/two_hosts_multi_hop.xml
teshsuite/simdag/platforms/two_hosts_one_link.xml
teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
teshsuite/smpi/bug-17132/bug-17132.tesh
teshsuite/smpi/privatization/privatization.tesh
teshsuite/smpi/privatization/privatization_dlopen.tesh
tools/simgrid_update_xml.pl

index 4746b97..a9fe036 100644 (file)
@@ -1,8 +1,8 @@
 <?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="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>
index 04dd2eb..2286d86 100644 (file)
@@ -1,10 +1,10 @@
 <?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 -->
-  </process>
+  </actor>
 </platform>
index de5170e..99a9fca 100644 (file)
@@ -1,9 +1,9 @@
 <?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 -->
-  </process>
+  </actor>
 </platform>
index 3c86f5b..c602a27 100644 (file)
@@ -1,19 +1,19 @@
 <?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 -->
-  </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 -->
-  </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 -->
-  </process>
+  </actor>
 </platform>
index 6afc3c8..adbb7cb 100644 (file)
@@ -1,9 +1,9 @@
 <?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 -->
-  </process>
+  </actor>
 </platform>
index e65416f..df70dfb 100644 (file)
@@ -1,39 +1,39 @@
 <?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" />
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </process>
+  </actor>
 </platform>
index 4d4bcb8..da816b5 100644 (file)
@@ -1,15 +1,15 @@
 <?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 -->
-  </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 -->
-  </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 -->
-  </process>
+  </actor>
 </platform>
index f632a5d..0a96f6c 100644 (file)
@@ -1,32 +1,32 @@
 <?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 -->
-  </process>
+  </actor>
 
-  <process host="Tremblay" function="app.masterworker.Worker">
+  <actor host="Tremblay" function="app.masterworker.Worker">
     <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 -->
-  </process>
-  <process host="Bourassa" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Bourassa" function="app.masterworker.Worker">
     <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 -->
-  </process>
-  <process host="Ginette" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Ginette" function="app.masterworker.Worker">
     <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 -->
-  </process>
-  <process host="Jacquelin" function="app.masterworker.Worker">
+  </actor>
+  <actor host="Jacquelin" function="app.masterworker.Worker">
     <argument value="6"/>  <!-- Input mailbox -->
-  </process>
+  </actor>
 </platform>
index 39875d4..2434d41 100644 (file)
@@ -1,62 +1,62 @@
 <?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"/>
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </process>
+  </actor>
 </platform>
index 2b113e8..748558f 100644 (file)
@@ -1,27 +1,27 @@
 <?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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </process>
+  </actor>
 </platform>
index 6389686..0310fc0 100644 (file)
@@ -1,22 +1,22 @@
 <?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"/>
-  </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"/>
-  </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" />
-  </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" />
-  </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" />
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 92a83da..26b1641 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="Fafard" function="task.priority.Test">
+  </actor>
+  <actor host="Fafard" function="task.priority.Test">
     <argument value="76296000"/>
     <argument value="2.0"/>
-  </process>
+  </actor>
 </platform>
index 8a5602e..dbecc0b 100644 (file)
@@ -1,7 +1,7 @@
 <?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>
index 846270d..831c9e0 100644 (file)
@@ -1,14 +1,14 @@
 <?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  -->
 
-  <process host="Tremblay" function="p0">
+  <actor host="Tremblay" function="p0">
     <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"/>
-  </process>
+  </actor>
 </platform>
index d2eb682..3f52ae6 100644 (file)
@@ -1,5 +1,5 @@
 <?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>
index 3836bde..5460ab1 100644 (file)
@@ -1,39 +1,39 @@
 <?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" />
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </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 --> 
-  </process>
+  </actor>
 </platform>
index dd83afe..73ab26b 100644 (file)
@@ -1,36 +1,36 @@
 <?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 -->
-  <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 -->
-  </process>
+  </actor>
 
   <!-- Peers -->
-  <process host="node-1.acme.org" function="peer">
+  <actor host="node-1.acme.org" function="peer">
     <argument value="1"/>
-  </process>
-  <process host="node-2.acme.org" function="peer">
+  </actor>
+  <actor host="node-2.acme.org" function="peer">
     <argument value="2"/>
-  </process>
-  <process host="node-3.acme.org" function="peer">
+  </actor>
+  <actor host="node-3.acme.org" function="peer">
     <argument value="3"/>
-  </process>
-  <process host="node-4.acme.org" function="peer">
+  </actor>
+  <actor host="node-4.acme.org" function="peer">
     <argument value="4"/>
-  </process>
-  <process host="node-5.acme.org" function="peer">
+  </actor>
+  <actor host="node-5.acme.org" function="peer">
     <argument value="5"/>
-  </process>
-  <process host="node-6.acme.org" function="peer">
+  </actor>
+  <actor host="node-6.acme.org" function="peer">
     <argument value="6"/>
-  </process>
-  <process host="node-7.acme.org" function="peer">
+  </actor>
+  <actor host="node-7.acme.org" function="peer">
     <argument value="7"/>
-  </process>
-  <process host="node-8.acme.org" function="peer">
+  </actor>
+  <actor host="node-8.acme.org" function="peer">
     <argument value="8"/>
-  </process>
+  </actor>
 </platform>
index e8ce4f9..cf8c0eb 100644 (file)
@@ -1,30 +1,30 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="worker">
+  <actor host="Tremblay" function="worker">
     <argument value="0"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
     <argument value="1"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
     <argument value="2"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
     <argument value="3"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
     <argument value="4"/> 
-  </process>
-  <process host="Tremblay" function="worker">
+  </actor>
+  <actor host="Tremblay" function="worker">
     <argument value="5"/> 
-  </process>
+  </actor>
 </platform>
index 11d28ff..cd7a4f4 100644 (file)
@@ -1,57 +1,57 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- The worker processes (with mailbox to listen on as argument) -->
-  <process host="100036570" function="worker">
+  <actor host="100036570" function="worker">
     <argument value="0"/> 
-  </process>
-  <process host="100041334" function="worker">
+  </actor>
+  <actor host="100041334" function="worker">
     <argument value="1"/> 
-  </process>
-  <process host="100055671" function="worker">
+  </actor>
+  <actor host="100055671" function="worker">
     <argument value="2"/> 
-  </process>
-  <process host="100066658" function="worker">
+  </actor>
+  <actor host="100066658" function="worker">
     <argument value="3"/> 
-  </process>
-  <process host="100090691" function="worker">
+  </actor>
+  <actor host="100090691" function="worker">
     <argument value="4"/> 
-  </process>
-  <process host="100094952" function="worker">
+  </actor>
+  <actor host="100094952" function="worker">
     <argument value="5"/> 
-  </process>
-  <process host="100117943" function="worker">
+  </actor>
+  <actor host="100117943" function="worker">
     <argument value="6"/> 
-  </process>
-  <process host="100126290" function="worker">
+  </actor>
+  <actor host="100126290" function="worker">
     <argument value="7"/> 
-  </process>
-  <process host="100144483" function="worker">
+  </actor>
+  <actor host="100144483" function="worker">
     <argument value="8"/> 
-  </process>
-  <process host="100152889" function="worker">
+  </actor>
+  <actor host="100152889" function="worker">
     <argument value="9"/> 
-  </process>
-  <process host="100178474" function="worker">
+  </actor>
+  <actor host="100178474" function="worker">
     <argument value="10"/> 
-  </process>
-  <process host="100180261" function="worker">
+  </actor>
+  <actor host="100180261" function="worker">
     <argument value="11"/> 
-  </process>
-  <process host="100185883" function="worker">
+  </actor>
+  <actor host="100185883" function="worker">
     <argument value="12"/> 
-  </process>
-  <process host="100186365" function="worker">
+  </actor>
+  <actor host="100186365" function="worker">
     <argument value="13"/> 
-  </process>
-  <process host="100200866" function="worker">
+  </actor>
+  <actor host="100200866" function="worker">
     <argument value="14"/> 
-  </process>
+  </actor>
 </platform>
index 869db93..feadead 100644 (file)
@@ -1,27 +1,27 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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"/> 
-  </process>
-  <process host="Jupiter" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Jupiter" function="worker" on_failure="RESTART">
     <argument value="1"/> 
-  </process>
-  <process host="Fafard" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Fafard" function="worker" on_failure="RESTART">
     <argument value="2"/> 
-  </process>
-  <process host="Ginette" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Ginette" function="worker" on_failure="RESTART">
     <argument value="3"/> 
-  </process>
-  <process host="Bourassa" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Bourassa" function="worker" on_failure="RESTART">
     <argument value="4"/> 
-  </process>
+  </actor>
 </platform>
index af7b1e3..c0fdc23 100644 (file)
@@ -1,11 +1,11 @@
 <?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 -->
-  <process host="Tremblay" function="pinger">
+  <actor host="Tremblay" function="pinger">
     <argument value="Jupiter"/>
-  </process>
-  <process host="Jupiter"  function="ponger">
+  </actor>
+  <actor host="Jupiter"  function="ponger">
     <argument value="Tremblay"/>
-  </process>
+  </actor>
 </platform>
index 6e73106..1e49112 100644 (file)
@@ -1,19 +1,19 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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 -->
-  </process>
+  </actor>
 </platform>
index 27c1d20..f1ef12d 100644 (file)
@@ -1,19 +1,19 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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 -->
-  </process>
+  </actor>
 </platform>
index 939d62e..84ca7e6 100644 (file)
@@ -1,20 +1,20 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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 -->
-  </process>
+  </actor>
 </platform>
 
index f72618e..e385572 100644 (file)
@@ -1,19 +1,19 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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 -->
-  </process>
+  </actor>
 </platform>
index 51f03d1..6f122c2 100644 (file)
@@ -1,15 +1,15 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- The receiver processes -->
-  <process host="Ruby" function="receiver">
+  <actor host="Ruby" function="receiver">
     <argument value="0"/>
-  </process>
+  </actor>
 </platform>
index 1972e41..2e680c4 100644 (file)
@@ -1,21 +1,21 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- The receiver processes -->
-  <process host="Fafard" function="receiver">
+  <actor host="Fafard" function="receiver">
     <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 -->
-  </process>
+  </actor>
 </platform>
index 0b1b17a..b1ab776 100644 (file)
@@ -1,10 +1,10 @@
 <?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  -->
-  </process>
-  <process host="Ruby" function="yielder">
+  </actor>
+  <actor host="Ruby" function="yielder">
     <argument value="15"/>       <!-- Number of yields to do  -->
-  </process>
+  </actor>
 </platform>
index f31fb7b..b698648 100644 (file)
@@ -1,62 +1,62 @@
 <?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"/>
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </process>
+  </actor>
 </platform>
index a63e6c9..e199776 100644 (file)
@@ -1,72 +1,72 @@
 <?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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </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 -->
-  </process>
+  </actor>
 </platform>
index 58be9ca..b0423a9 100644 (file)
@@ -1,7 +1,7 @@
 <?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 -->
 
@@ -40,5 +40,5 @@
     <route src="MyHost1" dst="MyHost2">
       <link_ctn id="link1"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 0bda8f8..838ab3d 100644 (file)
@@ -1,24 +1,24 @@
 <?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"/>
-  </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"/>
-  </process>
-  <process host="carl" function="host">
+  </actor>
+  <actor host="carl" function="host">
     <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"/>
-  </process>
+  </actor>
 </platform>
index 4333fd7..1f4b2a7 100644 (file)
@@ -1,16 +1,16 @@
 <?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"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
     <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
     <argument value="2"/>
-  </process>
-  <process host="HostD" function="client">
+  </actor>
+  <actor host="HostD" function="client">
     <argument value="3"/>
-  </process>
+  </actor>
 </platform>
index 08b755e..3d6b31c 100644 (file)
@@ -1,11 +1,11 @@
 <?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"/>
-  </process>
-  <process host="Fafard" function="client" >
+  </actor>
+  <actor host="Fafard" function="client" >
     <argument value="2"/>
-  </process>
+  </actor>
 </platform>
index 911865f..af31561 100644 (file)
@@ -1,11 +1,11 @@
 <?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"/>
-  </process>
-  <process host="Fafard" function="client" >
+  </actor>
+  <actor host="Fafard" function="client" >
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index c6dbe05..c95f94b 100644 (file)
@@ -1,13 +1,13 @@
 <?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"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
     <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
     <argument value="2"/>
-  </process>
+  </actor>
 </platform>
index 51ea5bf..e1b845c 100644 (file)
@@ -1,11 +1,11 @@
 <?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"/>
-  </process>
-  <process host="Boivin" function="client" >
+  </actor>
+  <actor host="Boivin" function="client" >
     <argument value="2"/>
-  </process>
+  </actor>
 </platform>
index c6dbe05..c95f94b 100644 (file)
@@ -1,13 +1,13 @@
 <?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"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
     <argument value="1"/>
-  </process>
-  <process host="HostC" function="client">
+  </actor>
+  <actor host="HostC" function="client">
     <argument value="2"/>
-  </process>
+  </actor>
 </platform>
index a22bda1..89ba1a2 100644 (file)
@@ -1,10 +1,10 @@
 <?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>
index cf7d227..1926770 100644 (file)
@@ -1,13 +1,13 @@
 <?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"/>
-  </process>
-  <process host="HostB" function="client">
+  </actor>
+  <actor host="HostB" function="client">
     <argument value="1"/>
-    </process>
-  <process host="HostC" function="client">
+    </actor>
+  <actor host="HostC" function="client">
     <argument value="2"/>
-  </process>
+  </actor>
 </platform>
index 3149f5c..29d062c 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -18,5 +18,5 @@
     <route src="HostA" dst="HostD">
       <link_ctn id="3"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index a360912..1d7171d 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="Jupiter" function="worker">
+  </actor>
+  <actor host="Jupiter" function="worker">
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index c9727c3..cc0e18a 100644 (file)
@@ -1,44 +1,44 @@
 <?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"/>
-  </process>
-  <process host="Jupiter" function="worker">
+  </actor>
+  <actor host="Jupiter" function="worker">
     <argument value="1"/>
-  </process>
-  <process host="Fafard" function="master">
+  </actor>
+  <actor host="Fafard" function="master">
     <argument value="10000"/>
     <argument value="Ginette"/>
     <argument value="2"/>
-  </process>
-  <process host="Ginette" function="worker">
+  </actor>
+  <actor host="Ginette" function="worker">
     <argument value="2"/>
-  </process>
-  <process host="Bourassa" function="master">
+  </actor>
+  <actor host="Bourassa" function="master">
     <argument value="10000"/>
     <argument value="Lovelace"/>
     <argument value="3"/>
-  </process>
-  <process host="Lovelace" function="worker">
+  </actor>
+  <actor host="Lovelace" function="worker">
     <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"/>
-  </process>
-  <process host="Lovelace" function="worker">
+  </actor>
+  <actor host="Lovelace" function="worker">
     <argument value="4"/>
-  </process>
-  <process host="Lovelace" function="timer">
+  </actor>
+  <actor host="Lovelace" function="timer">
     <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"/>
-  </process>
+  </actor>
 </platform>
index 9ae01af..2bb2b03 100644 (file)
@@ -1,28 +1,28 @@
 <?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"/>
-  </process>
-  <process host="Jupiter" function="worker">
+  </actor>
+  <actor host="Jupiter" function="worker">
     <argument value="1"/>
-  </process>
-  <process host="Fafard" function="master">
+  </actor>
+  <actor host="Fafard" function="master">
     <argument value="10000"/>
     <argument value="Ginette"/>
     <argument value="2"/>
-  </process>
-  <process host="Ginette" function="worker">
+  </actor>
+  <actor host="Ginette" function="worker">
     <argument value="2"/>
-  </process>
-  <process host="Bourassa" function="master">
+  </actor>
+  <actor host="Bourassa" function="master">
     <argument value="10000"/>
     <argument value="Lovelace"/>
     <argument value="3"/>
-  </process>
-  <process host="Lovelace" function="worker">
+  </actor>
+  <actor host="Lovelace" function="worker">
     <argument value="3"/>
-  </process>
+  </actor>
 </platform>
index 91ce479..cc69bd7 100644 (file)
@@ -1,36 +1,36 @@
 <?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"/>
-  </process>
-  <process host="C1" function="worker">
+  </actor>
+  <actor host="C1" function="worker">
     <argument value="1"/>
-  </process>
-  <process host="S1" function="master">
+  </actor>
+  <actor host="S1" function="master">
     <argument value="10000"/>
     <argument value="C1"/>
     <argument value="2"/>
-  </process>
-  <process host="C1" function="worker">
+  </actor>
+  <actor host="C1" function="worker">
     <argument value="2"/>
-  </process>
-  <process host="S1" function="master">
+  </actor>
+  <actor host="S1" function="master">
     <argument value="10000"/>
     <argument value="C1"/>
     <argument value="3"/>
-  </process>
-  <process host="C1" function="worker">
+  </actor>
+  <actor host="C1" function="worker">
     <argument value="3"/>
-  </process>
-  <process host="C1" function="master">
+  </actor>
+  <actor host="C1" function="master">
     <argument value="10000"/>
     <argument value="S1"/>
     <argument value="4"/>
-  </process>
-  <process host="S1" function="worker">
+  </actor>
+  <actor host="S1" function="worker">
     <argument value="4"/>
-  </process>
+  </actor>
 </platform>
index cf3068b..150a99a 100644 (file)
@@ -1,20 +1,20 @@
 <?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"/>
-  </process>
-  <process host="S2" function="master">
+  </actor>
+  <actor host="S2" function="master">
     <argument value="10000"/>
     <argument value="C2"/>
     <argument value="1"/>
-  </process>
-  <process host="C1" function="worker">
+  </actor>
+  <actor host="C1" function="worker">
     <argument value="0"/>
-  </process>
-  <process host="C2" function="worker">
+  </actor>
+  <actor host="C2" function="worker">
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index 9eab752..4c0f7bc 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="node-6.acme.org" function="worker">
+  </actor>
+  <actor host="node-6.acme.org" function="worker">
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index 4bc5107..2a2d4b2 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="C1" function="worker">
+  </actor>
+  <actor host="C1" function="worker">
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index db540cb..c104b21 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="node-16.acme.org" function="worker">
+  </actor>
+  <actor host="node-16.acme.org" function="worker">
     <argument value="1"/>
-  </process>
+  </actor>
 </platform>
index 98d3590..f4c76b9 100644 (file)
@@ -1,10 +1,10 @@
 <?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"/>
-  </process>
-  <process host="host2" function="carole" />
-  <process host="host2" function="david" />
+  </actor>
+  <actor host="host2" function="carole" />
+  <actor host="host2" function="david" />
 </platform>
index bc19db1..e24cced 100644 (file)
@@ -1,8 +1,8 @@
 <?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 -->
-  <process host="node-0.acme.org" function="sleeper">  
+  <actor host="node-0.acme.org" function="sleeper">  
     <argument value="10"/>
-  </process>
+  </actor>
 </platform>
index a85e3f6..6d7d312 100644 (file)
@@ -1,13 +1,13 @@
 <?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"/>
-  </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"/>
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 6819164..3d6934b 100644 (file)
@@ -1,22 +1,22 @@
 <?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"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 318c5fe..7292ca2 100644 (file)
@@ -1,22 +1,22 @@
 <?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"/>
-  </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"/>
-  </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" />
-  </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" />
-  </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" />
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 3d8f513..5d15f2b 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </process>
-  <process host="Fafard" function="test">
+  </actor>
+  <actor host="Fafard" function="test">
     <argument value="76296000"/>
     <argument value="2.0"/>
-  </process>
+  </actor>
 </platform>
index 37b973a..ea93cd3 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
     <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"/>
-    </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"/>
-    </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"/>
-    </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>
-  </AS>
+  </zone>
 </platform>
index 4b99bcc..072fe3a 100644 (file)
@@ -1,17 +1,17 @@
 <?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>
-    </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"/>
         <link_ctn id="AS_2_link6"/>
         <link_ctn id="AS_2_link5"/>
       </bypassRoute>
-    </AS>
+    </zone>
 
     <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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index fe0774b..82672ea 100644 (file)
@@ -1,8 +1,8 @@
 <?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 -->
@@ -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  -->
-      <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"/>
         <route src="gw_dc1_entranceroom" dst="router_AS1_dc1">
           <link_ctn id="dc1_entranceroom_ISP"/>
         </route>
-      </AS>
+      </zone>
 
       <!-- 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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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 -->
       <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"/>
         <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
           <link_ctn id="dc2_entranceroom_ISP"/>
         </route>
-      </AS>
+      </zone>
 
       <!-- 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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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 -->
       <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"/>
         <route src="gw_dc3_entranceroom" dst="router_AS3_dc3">
           <link_ctn id="dc3_entranceroom_ISP"/>
         </route>
-      </AS>
+      </zone>
 
       <!-- 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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </ASroute>
-    </AS>
-  </AS>
+      </zoneRoute>
+    </zone>
+  </zone>
 </platform>
index db66bf0..628427b 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
   <!--             _________
                   |          |
                   |  router  |
index fbdad7e..165f6d4 100644 (file)
@@ -1,18 +1,18 @@
 <?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"/>
 
-    <AS id="AS1" routing="None">
+    <zone id="AS1" routing="None">
       <host id="host1" speed="1Gf"/>
-    </AS>
+    </zone>
 
     <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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index a8d66d0..c54d4d6 100644 (file)
@@ -1,9 +1,9 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 83ff7d9..77a7237 100644 (file)
@@ -1,14 +1,14 @@
 <?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 -->
 
-  <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"/>
-  </AS>
+  </zone>
 </platform>
index 249f7cc..c3acb30 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
   <!--           _________
                 |          |
                 |  router  |
@@ -12,7 +12,7 @@
                 /     |     \
             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"/>
-  </AS>
+  </zone>
 </platform>
index 8fb7a06..1f9c8c0 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index fe25716..3bd41a5 100644 (file)
@@ -1,6 +1,6 @@
 <?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>
@@ -10,7 +10,7 @@
     <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"/>
 
@@ -23,5 +23,5 @@
       <link_ctn id="link2"/>
       <link_ctn id="link3"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 84fa6bc..38b306b 100644 (file)
@@ -1,6 +1,6 @@
 <?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"/>
@@ -11,7 +11,7 @@
     <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"/>
       <link_ctn id="6"/>
       <link_ctn id="7"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 50c09d2..dedcff8 100644 (file)
@@ -1,11 +1,11 @@
 <?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    -->
        
-  <AS id="1" routing="Full">
+  <zone id="1" routing="Full">
     <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>
-  </AS>
+  </zone>
 </platform>
index 807b0a0..95e8167 100644 (file)
@@ -1,8 +1,8 @@
 <?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"
@@ -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  -->
-      <AS id="gw_dataCenter1" routing="Floyd">
+      <zone id="gw_dataCenter1" routing="Floyd">
         <!-- equipments-->
         <router id="gw_dc1_horizdist"/>
         <router id="gw_dc1_maindist"/>
         <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
           <link_ctn id="dc1_entranceroom_ISP"/>
         </route>
-      </AS>
+      </zone>
 
       <!-- 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"/>
-      </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"/>
-      </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"/>
-      </ASroute>
-    </AS>
-  </AS>
+      </zoneRoute>
+    </zone>
+  </zone>
 </platform>
index 26a1a99..6587933 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -50,5 +50,5 @@
     <route src="R2" dst="C2">
       <link_ctn id="5"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 0d15f71..680a30e 100644 (file)
@@ -1,6 +1,6 @@
 <?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) -->
index d1ca0ff..0af3e71 100644 (file)
@@ -1,7 +1,7 @@
 <?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) -->
@@ -31,5 +31,5 @@
     <route src="MyHost2" dst="MyHost3">
       <link_ctn id="bus"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index bcb382c..60dc58a 100644 (file)
@@ -1,9 +1,9 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
 
index 9a8ae89..234b305 100644 (file)
@@ -1,5 +1,6 @@
 <?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.
@@ -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"/>
@@ -63,8 +63,8 @@
       <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_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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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_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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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_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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
 
-      <AS id="gw_AS_lyon" routing="Full">
+      <zone id="gw_AS_lyon" routing="Full">
         <router id="gw_lyon"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
 
-        <AS id="gw_AS_graphene" routing="Full">
+        <zone id="gw_AS_graphene" routing="Full">
           <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
-        </AS>
+        </zone>
         <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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </ASroute>
-        </AS>
+        </zoneRoute>
+        </zone>
       <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"/>
 
-        <AS id="gw_AS_griffon" routing="Full">
+        <zone id="gw_AS_griffon" routing="Full">
           <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
-        </AS>
+        </zone>
         <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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </ASroute>
-        </AS>
+        </zoneRoute>
+        </zone>
       <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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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_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"/>
-        </AS>
+        </zone>
         <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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
-        </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"/>
 
-      <AS id="gw_AS_orsay" routing="Full">
+      <zone id="gw_AS_orsay" routing="Full">
         <router id="gw_orsay"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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_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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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_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"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-      </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"/>
 
-      <AS id="gw_AS_toulouse" routing="Full">
+      <zone id="gw_AS_toulouse" routing="Full">
         <router id="gw_toulouse"/>
-      </AS>
+      </zone>
       <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"/>
-      </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"/>
-      </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"/>
-      </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index 69ac6e4..8aeb176 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
     <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"/>
-    </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"/>
-    </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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index 98d6c22..e30ce55 100644 (file)
@@ -1,29 +1,29 @@
 <?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"/>
-    </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"/>
-    </AS>
+    </zone>
 
     <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" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index 93134dc..68c0e21 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 2a86803..4682e74 100644 (file)
@@ -1,7 +1,7 @@
 <?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)     -->
 
@@ -11,5 +11,5 @@
     <route src="S1" dst="C1">
       <link_ctn id="1"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index eb22be6..fdf39cf 100644 (file)
@@ -1,21 +1,21 @@
 <?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 -->
-  <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"/>
 
-    <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"/>
-      </AS>
-      <AS id="AS2" routing="None">
+      </zone>
+      <zone id="AS2" routing="None">
         <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">
@@ -24,7 +24,7 @@
       <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"/>
@@ -44,6 +44,6 @@
         <link_ctn id="l1"/>
         <link_ctn id="l2"/>
       </route>
-    </AS>
-  </AS>
+    </zone>
+  </zone>
 </platform>
index a5e242e..872b303 100644 (file)
@@ -1,6 +1,6 @@
 <?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
        __________________________                   _________________________
        |                        |                   |                        |
@@ -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
 -->
-  <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"/>
@@ -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"/>
-    </AS>
+    </zone>
 
-    <AS  id="my_cluster2"  routing="Cluster">
+    <zone  id="my_cluster2"  routing="Cluster">
       <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"/>
-    </AS>
+    </zone>
 
     <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" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index 01da662..5cd432c 100644 (file)
@@ -1,8 +1,8 @@
 <?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. -->
-  <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"/>
@@ -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"/>
-  </AS>
+  </zone>
 </platform>
index 9c41850..3887685 100644 (file)
@@ -1,11 +1,11 @@
 <?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. -->
 
-  <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"/>
     <route src="Host 31" dst="Host 32">
       <link_ctn id="l173"/>
     </route>
-  </AS>
+  </zone>
 </platform>
 
index 0f6c5f5..576fa7b 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
       <link_ctn id="78"/>
       <link_ctn id="80"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index cf056b5..6376744 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -24,5 +24,5 @@
     <route src="Ruby" dst="Perl">
       <link_ctn id="4"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 0be82e2..faaad67 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -70,5 +70,5 @@
     <route src="Bourassa" dst="Lovelace">
       <link_ctn id="14"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 6dc6f93..a19986c 100644 (file)
@@ -1,7 +1,7 @@
 <?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" />
@@ -66,5 +66,5 @@
     <route src="Ginette" dst="Bourassa">
       <link_ctn id="10"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 91f619c..688d71c 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
       <link_ctn id="6"/>
       <link_ctn id="7"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 3caa9db..b654b9c 100644 (file)
@@ -1,11 +1,11 @@
 <?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>
 
-  <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"/> 
@@ -56,5 +56,5 @@
     <route src="carl" dst="dave">
       <link_ctn id="link6"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 6372351..449438e 100644 (file)
@@ -1,11 +1,11 @@
 <?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>
 
-  <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" />
@@ -46,5 +46,5 @@
     <route src="bob" dst="alice">
       <link_ctn id="link1" />
     </route>
-  </AS>
+  </zone>
 </platform>
index cbc9f00..0b237da 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -17,5 +17,5 @@
     <route src="PM1" dst="PM2">
       <link_ctn id="link1"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index bc85678..29ec619 100644 (file)
@@ -1,6 +1,6 @@
 <?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 -->
 
-  <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" />
 
@@ -31,9 +31,9 @@ node-10.acme.org               node-19.acme.org -->
 
     <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" />
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index 2aebc98..b6d03ba 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -10,7 +10,7 @@
     <route src="Tremblay" dst="Jupiter">
       <link_ctn id="1"/>
     </route>
-  </AS>
+  </zone>
 
   <trace id="Tremblay_power" periodicity="6.0">
     1.0 0.5
index 23e1d82..362f8a8 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -16,5 +16,5 @@
     <route src="cpu1" dst="cpu1">
       <link_ctn id="link0"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index c9d6e49..217b7a3 100644 (file)
@@ -1,12 +1,12 @@
 <?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>
-  </AS>
+  </zone>
 </platform>
index 3eb160f..b6fc419 100644 (file)
@@ -1,6 +1,6 @@
 <?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
     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>
-  </AS>
+  </zone>
 
   <trace_connect kind="SPEED" trace="A" element="Cpu A"/>
   <trace_connect kind="HOST_AVAIL" trace="A_failure" element="Cpu A"/>
index 92ac5d5..7236326 100644 (file)
@@ -1,8 +1,8 @@
 <?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" />
-  </AS>
+  </zone>
 </platform>
index f93727d..2bb79ed 100644 (file)
@@ -1,7 +1,7 @@
 <?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" />
@@ -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" />
-  </AS>
+  </zone>
 </platform>
index cce14e3..4e597fc 100644 (file)
@@ -1,6 +1,6 @@
 <?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>
index a88cf27..71d521a 100644 (file)
@@ -1,14 +1,14 @@
 <?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  -->
 
-  <process host="Tremblay" function="p0">
+  <actor host="Tremblay" function="p0">
     <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"/>
-  </process>
+  </actor>
 </platform>
index d2eb682..3f52ae6 100644 (file)
@@ -1,5 +1,5 @@
 <?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>
index 6cdc3da..11e719b 100644 (file)
@@ -1,6 +1,6 @@
 <?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().
     -
@@ -8,8 +8,8 @@
     -  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" />
-  </process>
+  </actor>
 </platform>
index 869db93..feadead 100644 (file)
@@ -1,27 +1,27 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- 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"/> 
-  </process>
-  <process host="Jupiter" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Jupiter" function="worker" on_failure="RESTART">
     <argument value="1"/> 
-  </process>
-  <process host="Fafard" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Fafard" function="worker" on_failure="RESTART">
     <argument value="2"/> 
-  </process>
-  <process host="Ginette" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Ginette" function="worker" on_failure="RESTART">
     <argument value="3"/> 
-  </process>
-  <process host="Bourassa" function="worker" on_failure="RESTART">
+  </actor>
+  <actor host="Bourassa" function="worker" on_failure="RESTART">
     <argument value="4"/> 
-  </process>
+  </actor>
 </platform>
index 26e2b17..d2af449 100644 (file)
@@ -1,44 +1,44 @@
 <?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"/>
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </process>
-</platform>
\ No newline at end of file
+  </actor>
+</platform>
index 58e2a0e..e454081 100755 (executable)
@@ -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">
-<platform version="4">
+<platform version="4.1">
 APPLICATIONHEAD
 
 ##---- cache hostnames of hostfile---------------
@@ -168,7 +168,7 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
 
-##---- generate <process> tags------------------------------
+##---- generate <actor> tags------------------------------
         do
            if [ -n "${HOSTFILE}" ]; then
                j=$(( ${NUMPROCS} % ${NUMHOSTS} +1))
@@ -180,13 +180,13 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then
                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 "  </process>" >> ${APPLICATIONTMP}
+            echo "  </actor>" >> ${APPLICATIONTMP}
             NUMPROCS=$(( ${NUMPROCS} +1))
         done
         # return IFS back to newline for "for" loop
index e879f74..75266f9 100644 (file)
@@ -1,39 +1,39 @@
 <?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 -->
-  </process>
+  </actor>
   <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">
+  <actor host="Tremblay" function="slave">
     <argument value="0"/>
-  </process>
-  <process host="Ginette" function="master_mpi">
+  </actor>
+  <actor host="Ginette" function="master_mpi">
     <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"/>
-  </process>
-  <process host="Ginette" function="alltoall_mpi">
+  </actor>
+  <actor host="Ginette" function="alltoall_mpi">
     <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"/>
-  </process>
-  <process host="Jupiter" function="alltoall_mpi">
+  </actor>
+  <actor host="Jupiter" function="alltoall_mpi">
     <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"/>
-  </process>
+  </actor>
 </platform>
index ac444b7..a8c75e1 100755 (executable)
@@ -323,7 +323,7 @@ if [ -z "${NUMPROCS}" ] ; 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 --------------------------------------
@@ -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">
-<platform version="4">
-<AS id="AS0" routing="Full">
+<platform version="4.1">
+<zone id="AS0" routing="Full">
 PLATFORMHEAD
 
     i=${NUMPROCS}
@@ -360,7 +360,7 @@ PLATFORMHEAD
     done
 
     cat >> ${PLATFORMTMP} <<PLATFORMFOOT
-</AS>
+</zone>
 </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">
-<platform version="4">
+<platform version="4.1">
 APPLICATIONHEAD
 
 ##---- cache hostnames of hostfile---------------
@@ -415,7 +415,7 @@ fi
 
 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}\"/>
@@ -427,12 +427,12 @@ do
     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
 
-    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
@@ -444,7 +444,7 @@ do
     else 
     echo ${XML_ARGS} >> ${APPLICATIONTMP}
     fi
-    echo "  </process>" >> ${APPLICATIONTMP}
+    echo "  </actor>" >> ${APPLICATIONTMP}
 done
 
 cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
index 13d2cc4..f2b787c 100644 (file)
@@ -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
 
-* 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>
index 466f8d2..d59eeb0 100644 (file)
@@ -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.");
-  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();
 }
@@ -471,8 +485,8 @@ void STag_surfxml_host(){
 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);
   }
@@ -936,7 +950,7 @@ void ETag_surfxml_AS(){
 }
 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);
@@ -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) {
-    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(){
index f1325de..d6eb805 100644 (file)
@@ -1,11 +1,11 @@
 <?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"/>
-  </process>
-  <process host="Fafard" function="sender">
+  </actor>
+  <actor host="Fafard" function="sender">
     <argument value="Y"/>
-  </process>
+  </actor>
 </platform>
index 68c4ccc..b761bdb 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index d12fc7b..aa093e3 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index 6ae2f4e..a919a73 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index 4c9a178..28c048a 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index 33087be..a6ee0c0 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index 028b9a1..2bf91a1 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index 8beb1c2..cd8c9c0 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index c412fe1..4fd1842 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </process>
+  </actor>
 </platform>
index b4a9f57..4d2d81a 100644 (file)
@@ -1,16 +1,16 @@
 <?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"/>
-  </process>
-  <process host="Cpu B" function="test_trace">
+  </actor>
+  <actor host="Cpu B" function="test_trace">
     <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"/>
-  </process>
+  </actor>
 </platform>
index 504497c..7de0dc6 100644 (file)
@@ -1,16 +1,16 @@
 <?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"/>
-  </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"/>
-  </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"/>
-  </process>
+  </actor>
 </platform>
index aaa2f6c..b31e3ca 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 163924b..0048734 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </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"/>
-  </process>
+  </actor>
 </platform>
index 6a28da6..b45ef48 100644 (file)
@@ -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.
-> [  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@] 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
index 6039c37..80d0a67 100644 (file)
@@ -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: "AS". 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: "zone". Type: netzone
index d04c636..cf18d7b 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -32,5 +32,5 @@
       <link_ctn id="11"/>
       <link_ctn id="12"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index d038fc1..d13d470 100644 (file)
@@ -1,9 +1,9 @@
 <?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 -->
-  <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" />
@@ -15,5 +15,5 @@
     <host id="client" speed="1Gf">
       <mount storageId="cdisk" name="/sd1" />
     </host>
-  </AS>
+  </zone>
 </platform>
index d297f04..c754f89 100644 (file)
@@ -1,18 +1,18 @@
 <?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"/>
-    </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"/>
-    </AS>
+    </zone>
 
     <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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index b935300..8de74a8 100644 (file)
@@ -1,18 +1,18 @@
 <?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"/>
-    </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"/>
-    </AS>
+    </zone>
 
     <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"/>
-    </ASroute>
-  </AS>
+    </zoneRoute>
+  </zone>
 </platform>
index ec52306..34eb3f2 100644 (file)
@@ -1,10 +1,10 @@
 <?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) -->
-  <AS  id="AS0"  routing="Full">
+  <zone  id="AS0"  routing="Full">
     <host id="bob" speed="1Gf"/>
     <host id="alice" speed="500Mf"/>
 
@@ -17,5 +17,5 @@
     <route src="alice" dst="bob">
       <link_ctn id="link2"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 3e851a6..eaa710a 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -24,5 +24,5 @@
     <route src="host3" dst="host4">
       <link_ctn id="link4"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index b0d28e0..daedebb 100644 (file)
@@ -1,7 +1,7 @@
 <?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 -->
@@ -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 --> 
-  </AS>
+  </zone>
 
   <trace id="myTrace" periodicity="1.0">
     0.0 1.0
index 62bc33d..9e037ae 100644 (file)
@@ -1,12 +1,12 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 29c7984..fc8e1cd 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index d998894..c44fa11 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 18de947..7c1d08e 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 3682739..fa52d2b 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index d996cbc..fc9eae4 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -13,5 +13,5 @@
     <route src="cpu0" dst="cpu1">
       <link_ctn id="link0"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index 12d2174..9f76670 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -10,5 +10,5 @@
     <route src="cpu0" dst="cpu1">
       <link_ctn id="link0"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index ed3396e..bc4740a 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -10,5 +10,5 @@
     <route src="cpu0" dst="cpu1">
       <link_ctn id="link0"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index c0d1e78..db1e5b8 100644 (file)
@@ -1,7 +1,7 @@
 <?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" />
 
@@ -10,5 +10,5 @@
     <route src="cpu0" dst="cpu1">
       <link_ctn id="link0" />
     </route>
-  </AS>
+  </zone>
 </platform>
index 34286fc..2082b8a 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
 
@@ -14,5 +14,5 @@
       <link_ctn id="switch"/>
       <link_ctn id="link1"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index e14dbf1..bc41679 100644 (file)
@@ -1,7 +1,7 @@
 <?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"/>
@@ -43,5 +43,5 @@
       <link_ctn id="switch"/>
       <link_ctn id="link3"/>
     </route>
-  </AS>
+  </zone>
 </platform>
index d73a133..fa5cede 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-  </AS>
+  </zone>
 </platform>
index 28dfd08..d1d2760 100644 (file)
@@ -1,6 +1,6 @@
 <?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"/>
@@ -8,7 +8,7 @@
     <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"/>
-  </AS>
+  </zone>
 </platform>
index 70d10ce..c20f45e 100644 (file)
@@ -1,31 +1,31 @@
 <?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"/>
-    </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"/>
-    </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"/>
-    </AS>
-    <AS  id="AS3"  routing="DijkstraCache">
+    </zone>
+    <zone  id="AS3"  routing="DijkstraCache">
       <host id="host07" speed="1Gf"/>
       <host id="host08" speed="500Mf"/>