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
Fix old typo: CpuTiTgmr -> CpuTiTmgr.
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
62b5ce5
..
ad16d13
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-45,7
+45,7
@@
CpuTiTrace::~CpuTiTrace()
delete [] integral_;
}
delete [] integral_;
}
-CpuTiT
gmr::~CpuTiTgm
r()
+CpuTiT
mgr::~CpuTiTmg
r()
{
if (trace_)
delete trace_;
{
if (trace_)
delete trace_;
@@
-61,7
+61,7
@@
CpuTiTgmr::~CpuTiTgmr()
* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
-double CpuTiT
gm
r::integrate(double a, double b)
+double CpuTiT
mg
r::integrate(double a, double b)
{
int a_index;
{
int a_index;
@@
-138,7
+138,7
@@
double CpuTiTrace::integrate_simple_point(double a)
* \param amount Amount to be executed
* \return End time
*/
* \param amount Amount to be executed
* \return End time
*/
-double CpuTiT
gm
r::solve(double a, double amount)
+double CpuTiT
mg
r::solve(double a, double amount)
{
/* Fix very small negative numbers */
if ((a < 0.0) && (a > -EPSILON)) {
{
/* Fix very small negative numbers */
if ((a < 0.0) && (a > -EPSILON)) {
@@
-212,7
+212,7
@@
double CpuTiTrace::solve_simple(double a, double amount)
* \param a Time
* \return CPU speed scale
*/
* \param a Time
* \return CPU speed scale
*/
-double CpuTiT
gm
r::get_power_scale(double a)
+double CpuTiT
mg
r::get_power_scale(double a)
{
double reduced_a = a - floor(a / last_time_) * last_time_;
int point = trace_->binary_search(trace_->time_points_, reduced_a, 0, trace_->nb_points_ - 1);
{
double reduced_a = a - floor(a / last_time_) * last_time_;
int point = trace_->binary_search(trace_->time_points_, reduced_a, 0, trace_->nb_points_ - 1);
@@
-227,7
+227,7
@@
double CpuTiTgmr::get_power_scale(double a)
* \param value Percentage of CPU speed available (useful to fixed tracing)
* \return Integration trace structure
*/
* \param value Percentage of CPU speed available (useful to fixed tracing)
* \return Integration trace structure
*/
-CpuTiT
gmr::CpuTiTgm
r(tmgr_trace_t speedTrace, double value) : speed_trace_(speedTrace)
+CpuTiT
mgr::CpuTiTmg
r(tmgr_trace_t speedTrace, double value) : speed_trace_(speedTrace)
{
double total_time = 0.0;
trace_ = 0;
{
double total_time = 0.0;
trace_ = 0;
@@
-362,7
+362,7
@@
CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *s
speed_.peak = speedPerPstate->front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
speed_.peak = speedPerPstate->front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
- speed_integrated_trace_ = new CpuTiT
gm
r(nullptr, 1 /*scale*/);
+ speed_integrated_trace_ = new CpuTiT
mg
r(nullptr, 1 /*scale*/);
}
CpuTi::~CpuTi()
}
CpuTi::~CpuTi()
@@
-375,7
+375,7
@@
void CpuTi::set_speed_trace(tmgr_trace_t trace)
if (speed_integrated_trace_)
delete speed_integrated_trace_;
if (speed_integrated_trace_)
delete speed_integrated_trace_;
- speed_integrated_trace_ = new CpuTiT
gm
r(trace, speed_.scale);
+ speed_integrated_trace_ = new CpuTiT
mg
r(trace, speed_.scale);
/* add a fake trace event if periodicity == 0 */
if (trace && trace->event_list.size() > 1) {
/* add a fake trace event if periodicity == 0 */
if (trace && trace->event_list.size() > 1) {
@@
-389,7
+389,7
@@
void CpuTi::apply_event(tmgr_trace_event_t event, double value)
{
if (event == speed_.event) {
tmgr_trace_t speedTrace;
{
if (event == speed_.event) {
tmgr_trace_t speedTrace;
- CpuTiT
gmr *
trace;
+ CpuTiT
mgr*
trace;
XBT_DEBUG("Finish trace date: value %f", value);
/* update remaining of actions and put in modified cpu list */
XBT_DEBUG("Finish trace date: value %f", value);
/* update remaining of actions and put in modified cpu list */
@@
-402,7
+402,7
@@
void CpuTi::apply_event(tmgr_trace_event_t event, double value)
delete speed_integrated_trace_;
speed_.scale = val.value_;
delete speed_integrated_trace_;
speed_.scale = val.value_;
- trace = new CpuTiT
gm
r(TRACE_FIXED, val.value_);
+ trace = new CpuTiT
mg
r(TRACE_FIXED, val.value_);
XBT_DEBUG("value %f", val.value_);
speed_integrated_trace_ = trace;
XBT_DEBUG("value %f", val.value_);
speed_integrated_trace_ = trace;