X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9de85055aad497b71cb6a2484096228acfa0432..1c7dbc7e7255bc670c53414593e9fbdf5b366c1d:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 590dae1fef..22b73e9c5b 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -223,9 +223,9 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); } -Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) +Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) { - return new CpuL07(this, host, speedPerPstate, core); + return new CpuL07(this, host, speed_per_pstate, core); } kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, @@ -238,8 +238,9 @@ kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, * Resource * ************/ -CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) +CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) + : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate->front()), speed_per_pstate, + core) { } @@ -285,7 +286,8 @@ bool CpuL07::is_used() } /** @brief take into account changes of speed (either load or max) */ -void CpuL07::onSpeedChange() { +void CpuL07::on_speed_change() +{ kernel::lmm::Variable* var = nullptr; const kernel::lmm::Element* elem = nullptr; @@ -296,7 +298,7 @@ void CpuL07::onSpeedChange() { get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } - Cpu::onSpeedChange(); + Cpu::on_speed_change(); } bool LinkL07::is_used() @@ -309,7 +311,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); if (triggered == speed_.event) { speed_.scale = value; - onSpeedChange(); + on_speed_change(); tmgr_trace_event_unref(&speed_.event); } else if (triggered == state_event_) {