X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 4873c1235e..3d7be6fc91 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -113,18 +113,16 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector *speedPerPs { } -Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, - std::vector * speedPerPstate, int core) - : Resource(model, host->name().c_str(), constraint) - , coresAmount_(core) - , host_(host) +Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector* speedPerPstate, + int core) + : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host) { - xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str()); + xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname()); speed_.peak = speedPerPstate->front(); speed_.scale = 1; host->pimpl_cpu = this; - xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str()); + xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname()); // Copy the power peak array: for (double value : *speedPerPstate) { @@ -193,13 +191,13 @@ int Cpu::coreCount() void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str()); + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname()); stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); } void Cpu::setSpeedTrace(tmgr_trace_t trace) { - xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str()); + xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname()); speed_.event = future_evt_set->add_trace(trace, 0.0, this); }