X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fd8e8ffb447edb19f32e3200a7dbef3d83138b6..8fd201f4f62bc9df101f5aba99192e18ddcea513:/examples/platforms/cluster_multi.xml

diff --git a/examples/platforms/cluster_multi.xml b/examples/platforms/cluster_multi.xml
index 391114468d..6f014fc31b 100644
--- a/examples/platforms/cluster_multi.xml
+++ b/examples/platforms/cluster_multi.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0'?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <zone id="world" routing="Full">
   <!-- this platform models 3 clusters, interconnected over the Internet
-    --
-    -- This example intends to be somewhat exhaustive, your platform should probably be simpler.
-    --
-    -- In particular, the clusters are modeled in very different ways,
-    -- but you should pick the way you prefer, and stick to it.
+    -
+    -  This example intends to be somewhat exhaustive, your platform should probably be simpler.
+    - 
+    -  In particular, the clusters are modeled in very different ways,
+    -  but you should pick the way you prefer, and stick to it.
     -->
 
   <!-- Here comes the first cluster, the simplest one.
@@ -15,77 +15,71 @@
        Every nodes are connected through a private link to a router
        (ie a machine that cannot host computations).
   
-       node-0.1core.org --[l0]--
+       node-0.1core.org __[l0]__
                                 \
-       node-1.1core.org --[l1]-- router -- (outer world)
+       node-1.1core.org __[l1]__router___(outer world)
                 ...             /
-       node-7.1core.org --[l9]--
-
+       node-7.1core.org __[l9]_/
  
        So the route from node-0 to node-1 is {l0.UP, l1.DOWN}
     -->
-  <cluster id="simple" prefix="node-" radical="0-7" suffix=".1core.org" speed="1Gf" bw="125MBps" lat="50us" />
+  <cluster bw="125MBps" id="simple" lat="50us" prefix="node-" radical="0-7" speed="1Gf" suffix=".1core.org">
+    <prop id="wattage_per_state" value="0.0:1.0:1.0" />
+    <prop id="wattage_off" value="0.0" />
+  </cluster>
 
 
   <!-- This second cluster has a backbone link, connecting all private links:
-
-       node-0.2cores.org --[l0]-------+
+       node-0.2cores.org __[l0]______+
                                      |
-       node-1.2cores.org --[l1]--[backbone]-- router -- (outer world)
+       node-1.2cores.org __[l1]__[backbone]__ router __ (outer world)
                 ...                  |
-       node-7.2cores.org --[l7]-------+
-
-
+       node-7.2cores.org __[l7]______+
     The route from node-0 to node-1 is: l0.UP ; backbone ; l1.DOWN
     
     The route from node-0 to the outer world begins with: l0.UP ; backbone
   -->    
-  <cluster id="backboned" prefix="node-" radical="0-7" suffix=".2cores.org"
-              speed="1Gf"       core="2" 
-	      bw="125MBps"      lat="50us"
-           bb_bw="2.25GBps"  bb_lat="500us"/>
+  <cluster bb_bw="2.25GBps" bb_lat="500us" bw="125MBps" core="2" id="backboned" lat="50us" prefix="node-" radical="0-7" speed="1Gf" suffix=".2cores.org">
+    <prop id="wattage_per_state" value="0.0:0.0:2.0" />
+    <prop id="wattage_off" value="0.0" />
+  </cluster>
 	   
 
   <!-- This cluster has a backbone link, but no links are splitduplex.
-    -- It means that up and down communications compete as if they
-    -- were using exactly the same resource. If you send and receive
-    -- at the same time, then each get half of the bandwidth.
-    --
-    -- Also, the hosts have 4 cores.
+    -  It means that up and down communications compete as if they
+    -  were using exactly the same resource. If you send and receive
+    -  at the same time, then each get half of the bandwidth.
+    - 
+    -  Also, the hosts have 4 cores.
     -->
-  <cluster id="halfduplex" prefix="node-" radical="0-7" suffix=".4cores.org" speed="1Gf" core="4"
-              bw="125MBps"      lat="50us"     sharing_policy="SHARED"
-	   bb_bw="2.25GBps"  bb_lat="500us" bb_sharing_policy="SHARED" />
-
+  <cluster bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED" bw="125MBps" core="4" id="halfduplex" lat="50us" prefix="node-" radical="0-7" sharing_policy="SHARED" speed="1Gf" suffix=".4cores.org">
+    <prop id="wattage_per_state" value="0.0:0.0:4.0" />
+    <prop id="wattage_off" value="0.0" />
+  </cluster>
 
   <!-- And now, we create the routes between the clusters, ie inter-zone routes -->
   
   <!-- We have only one outer link, representing the internet 
-    -- Its sharing is FATPIPE, meaning that communications have no impact on each others.
-    -- Any given comm can use the full provided bandwidth. 
-    --
-    -- This models the big links constituting the backbone of the internet, 
-    -- that users cannot saturate. 
-    -- Users' bandwidth is mostly limited by their outgoing connexion,
-    -- not by the network backbone. -->
+    -  Its sharing is FATPIPE, meaning that communications have no impact on each others.
+    -  Any given comm can use the full provided bandwidth. 
+    - 
+    -  This models the big links constituting the backbone of the internet, 
+    -  that users cannot saturate. 
+    -  Users' bandwidth is mostly limited by their outgoing connection,
+    -  not by the network backbone.
+    -->
 
-    <link id="backbone" bandwidth="1.25GBps" latency="500us" sharing_policy="FATPIPE"/>
+    <link bandwidth="1.25GBps" id="backbone" latency="500us" sharing_policy="FATPIPE" />
 
-    <zoneRoute src="simple" dst="backboned" 
-               gw_src="node-simple_router.1core.org"
-               gw_dst="node-backboned_router.2cores.org">
+    <zoneRoute dst="backboned" gw_dst="node-backboned_router.2cores.org" gw_src="node-simple_router.1core.org" src="simple">
       <link_ctn id="backbone" />
     </zoneRoute>
 
-    <zoneRoute src="simple" dst="halfduplex" 
-               gw_src="node-simple_router.1core.org"
-               gw_dst="node-halfduplex_router.4cores.org">
+    <zoneRoute dst="halfduplex" gw_dst="node-halfduplex_router.4cores.org" gw_src="node-simple_router.1core.org" src="simple">
       <link_ctn id="backbone" />
     </zoneRoute>
     
-    <zoneRoute src="backboned" dst="halfduplex" 
-               gw_src="node-backboned_router.2cores.org"
-               gw_dst="node-halfduplex_router.4cores.org">
+    <zoneRoute dst="halfduplex" gw_dst="node-halfduplex_router.4cores.org" gw_src="node-backboned_router.2cores.org" src="backboned">
       <link_ctn id="backbone" />
     </zoneRoute>
 </zone>