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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
plugins
/
energy.hpp
diff --git
a/src/surf/plugins/energy.hpp
b/src/surf/plugins/energy.hpp
index
5839da8
..
9b776be
100644
(file)
--- a/
src/surf/plugins/energy.hpp
+++ b/
src/surf/plugins/energy.hpp
@@
-22,9
+22,12
@@
public:
double getCurrentWattsValue(double cpu_load);
double getConsumedEnergy();
double getCurrentWattsValue(double cpu_load);
double getConsumedEnergy();
- xbt_dynar_t getWattsRangeList();
+ double getWattMinAt(int pstate);
+ double getWattMaxAt(int pstate);
- xbt_dynar_t power_range_watts_list; /*< List of (min_power,max_power) pairs corresponding to each cpu pstate */
+ xbt_dynar_t getWattsRangeList();
+ xbt_dynar_t power_range_watts_list; /*< List of (min_power,max_power) pairs corresponding to each cpu pstate */
+ double watts_off; /*< Consumption when the machine is turned off (shutdown) */
double total_energy; /*< Total energy consumed by the host */
double last_updated; /*< Timestamp of the last energy update event*/
CpuPtr cpu;
double total_energy; /*< Total energy consumed by the host */
double last_updated; /*< Timestamp of the last energy update event*/
CpuPtr cpu;