CpuAction *action = nullptr;
ActionList *running_actions = getRunningActionSet();
ActionList::iterator it(running_actions->begin());
- ActionList::iterator itend(running_actions->end()) for (; it != itend; ++it)
- {
+ ActionList::iterator itNext = it;
+ ActionList::iterator itend(running_actions->end());
+ for (; it != itend; it = itNext) {
+ ++itNext;
action = static_cast<CpuAction*>(&*it);
if (TRACE_is_enabled()) {
Cpu *cpu = static_cast<Cpu*> (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) );
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
-
if (action->getMaxDuration() != NO_MAX_DURATION)
action->updateMaxDuration(delta);
-
- if ((action->getRemainsNoUpdate() <= 0) &&
- (lmm_get_variable_weight(action->getVariable()) > 0)) {
- action->finish();
- action->setState(Action::State::done);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
- (action->getMaxDuration() <= 0)) {
+ if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
}
Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
int core)
- : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host)
+ : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host)
{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());
+ xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname());
speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());
+ xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname());
// Copy the power peak array:
for (double value : *speedPerPstate) {
speedPerPstate_.push_back(value);
}
-
- xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore");
}
Cpu::~Cpu() = default;
-/** @brief The amount of flop per second that this CPU can compute at its current DVFS level */
-double Cpu::getPstateSpeedCurrent()
-{
- return speed_.peak;
-}
-
int Cpu::getNbPStates()
{
return speedPerPstate_.size();
void Cpu::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname());
- stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
+ stateEvent_ = future_evt_set->add_trace(trace, this);
}
void Cpu::setSpeedTrace(tmgr_trace_t trace)
{
- xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());
+ xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname());
- speed_.event = future_evt_set->add_trace(trace, 0.0, this);
+ speed_.event = future_evt_set->add_trace(trace, this);
}