X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bba28202d80db522aef1af8dd81c9b9e3e0d3049..b99d3a6127ec8f300b95e9bc3a90085814a19539:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index d15f1d2d58..d903ac8bc3 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -313,9 +313,9 @@ CpuTiModel::~CpuTiModel() surf_cpu_model_pm = nullptr; } -Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, std::vector* speedPerPstate, int core) +Cpu* CpuTiModel::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) { - return new CpuTi(this, host, speedPerPstate, core); + return new CpuTi(this, host, speed_per_pstate, core); } double CpuTiModel::next_occuring_event(double now) @@ -402,10 +402,10 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) tmgr_trace_event_unref(&speed_.event); - } else if (event == stateEvent_) { + } else if (event == state_event_) { if (value > 0) { if (is_off()) - host_that_restart.push_back(getHost()); + host_that_restart.push_back(get_host()); turn_on(); } else { turn_off(); @@ -422,7 +422,7 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) } } } - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n");