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 'condvar'
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
64b46e6
..
c1ab0e1
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-176,7
+176,7
@@
Cpu::~Cpu()
xbt_dynar_free(&speedPerPstate_);
}
xbt_dynar_free(&speedPerPstate_);
}
-double Cpu::get
CurrentPowerPeak
()
+double Cpu::get
PstateSpeedCurrent
()
{
return speed_.peak;
}
{
return speed_.peak;
}
@@
-204,7
+204,7
@@
int Cpu::getPState()
return pstate_;
}
return pstate_;
}
-double Cpu::getP
owerPeakAt
(int pstate_index)
+double Cpu::getP
stateSpeed
(int pstate_index)
{
xbt_dynar_t plist = speedPerPstate_;
xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
{
xbt_dynar_t plist = speedPerPstate_;
xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");