From 3880211b850704febd20f1a482b4617919ed9025 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 26 Jan 2015 21:57:09 +0100
Subject: [PATCH] rename the property used by the energy plugin for clarity

---
 examples/platforms/energy_platform.xml | 4 ++--
 src/surf/plugins/energy.cpp            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml
index cb6d3325fc..837545b787 100644
--- a/examples/platforms/energy_platform.xml
+++ b/examples/platforms/energy_platform.xml
@@ -7,10 +7,10 @@
   <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="power_per_state" value="95.0:200.0, 93.0:170.0, 90.0:150.0" />
+        <prop id="watt_per_state" value="95.0:200.0, 93.0:170.0, 90.0:150.0" />
   </host>
   <host id="MyHost2" power="100.0Mf" >
-        <prop id="power_per_state" value="95.0:200.0" />
+        <prop id="watt_per_state" value="95.0:200.0" />
   </host>
 
   <link id="link1" bandwidth="100kBps" latency="0"/>
diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 4fd94acf79..6c55cf414a 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
 /** @addtogroup SURF_plugin_energy
  *
  *
- *  BlaBla energy
+ *  This is the energy plugin, enabling to account not only for computation time, but also for the dissipated energy in the simulated platform.
  */
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
@@ -144,7 +144,7 @@ xbt_dynar_t CpuEnergy::getWattsRangeList()
 	if (cpu->getProperties() == NULL)
 		return NULL;
 
-	char* all_power_values_str = (char*)xbt_dict_get_or_null(cpu->getProperties(), "power_per_state");
+	char* all_power_values_str = (char*)xbt_dict_get_or_null(cpu->getProperties(), "watt_per_state");
 
 	if (all_power_values_str == NULL)
 		return NULL;
-- 
2.20.1