X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58de6e0115d311e93b28c712e9e74b89fd81d40a..b2d191d0e256fee6004d4140c395f31abb9dd7ec:/examples/platforms/energy_platform.xml

diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index 944d1dda91..03ce9c7e22 100644
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -1,28 +1,39 @@
 <?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 -->
-  <!-- Attribute 'pstate' specifies the initialy selected pstate (here, the 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="100.0:200.0, 93.0:170.0, 90.0:150.0" />
-        <prop id="watt_off" value="10" />
-  </host>
-  <host id="MyHost2" power="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-        <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
-        <prop id="watt_off" value="10" />
-  </host>
-  <host id="MyHost3" power="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
-        <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.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" core="4" >
+      <!--  List of Idle:OneCore:AllCores (in Watts) corresponding to the speed consumed when the processor is idle
+            and when one core is at full speed, and when all cores are fully loaded -->
+      <!--  The list must contain one energetic profile 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" core="1" >
+      <!-- This host is mono-core, so AllCores=OneCore and is omitted -->
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
+    
+    <host id="MyHost3" speed="100.0Mf,50.0Mf,20.0Mf" pstate="0" core="1" >
+      <!-- This host is mono-core, so AllCores=OneCore and is omitted -->
+      <prop id="watt_per_state" value="100.0:200.0, 93.0:170.0, 90.0:150.0" />
+      <prop id="watt_off" value="10" />
+    </host>
 
-  <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>
-  
-</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>