X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffe8ce65fd9a8e18a0469f26f067c3ea6d5d60d4..35df179b2e3676de81d6864c54a6ebd16ef74902:/examples/platforms/energy_platform.xml

diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index 7799229b09..0af3e71fc5 100644
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -1,22 +1,35 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS  id="AS0"  routing="Full">
-  <!-- Multiple pstate processor capacities can be defined as a list of powers specified for a given host -->
-  <!-- The enabled pstate can be set through the "pstate" attribute (lowest pstate corresponds to the highest processor power) -->
-  <host id="MyHost1" power="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-        <!--  List of min_power:max_power pairs (in Watts) corresponding to the power consumed when the processor is idle and when it is fully loaded -->
-        <!--  The list must contain one power pair for each previously defined pstate-->
-        <prop id="watt_per_state" value="95.0:200.0, 93.0:170.0, 90.0:150.0" />
-        <prop id="watt_off" value="10" />
-  </host>
-  <host id="MyHost2" power="100.0Mf" >
-        <prop id="watt_per_state" value="100.0:200.0" />
-        <prop id="watt_off" value="10" />
-  </host>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<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) -->
+    <host id="MyHost1" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <!--  List of min_power:max_power pairs (in Watts) corresponding to the speed consumed when the processor is idle
+            and when it is fully loaded -->
+      <!--  The list must contain one speed pair for each previously defined pstate-->
+      <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
+    <host id="MyHost2" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
+    <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+      <prop id="watt_per_state" value="100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
 
-  <link id="link1" bandwidth="100kBps" latency="0"/>
-  <route src="MyHost1" dst="MyHost2"><link_ctn id="link1"/></route>
-  
-</AS>
+    <link id="bus" bandwidth="100kBps" latency="0"/>
+    <route src="MyHost1" dst="MyHost2">
+      <link_ctn id="bus"/>
+    </route>
+    <route src="MyHost1" dst="MyHost3">
+      <link_ctn id="bus"/>
+    </route>
+    <route src="MyHost2" dst="MyHost3">
+      <link_ctn id="bus"/>
+    </route>
+  </zone>
 </platform>