A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename the property used by the energy plugin for clarity
[simgrid.git]
/
src
/
surf
/
plugins
/
energy.cpp
diff --git
a/src/surf/plugins/energy.cpp
b/src/surf/plugins/energy.cpp
index
4fd94ac
..
6c55cf4
100644
(file)
--- a/
src/surf/plugins/energy.cpp
+++ b/
src/surf/plugins/energy.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010, 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2010, 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,7
+10,7
@@
/** @addtogroup SURF_plugin_energy
*
*
/** @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);
*/
XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
@@
-144,7
+144,7
@@
xbt_dynar_t CpuEnergy::getWattsRangeList()
if (cpu->getProperties() == NULL)
return NULL;
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;
if (all_power_values_str == NULL)
return NULL;