energy_platform: add pstates to the second host too

And remove the modified copy from the example/msg/vm directory

diff --git a/examples/msg/energy/vm/energy_platform.xml b/examples/msg/energy/vm/energy_platform.xml
deleted file mode 100644 (file)
index 8009e81..0000000
--- a/examples/msg/energy/vm/energy_platform.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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,50.0Mf,20.0Mf" pstate="0" >
-        <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>
-
-  <link id="link1" bandwidth="100kBps" latency="0"/>
-  <route src="MyHost1" dst="MyHost2"><link_ctn id="link1"/></route>
-  
-</AS>
-</platform>

diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index 7799229..8009e81 100644 (file)
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -10,8 +10,8 @@
         <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" />
+  <host id="MyHost2" power="100.0Mf,50.0Mf,20.0Mf" pstate="0" >
+        <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>