if (optim == "Full") {
setUpdateMechanism(UM_FULL);
- selectiveUpdate_ = select;
} else if (optim == "Lazy") {
setUpdateMechanism(UM_LAZY);
- selectiveUpdate_ = true;
+ select = true;
xbt_assert(select || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")),
"Disabling selective update while using the lazy update mechanism is dumb!");
} else {
xbt_die("Unsupported optimization (%s) for this model", optim.c_str());
}
- maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_);
+ maxmin_system_ = new simgrid::kernel::lmm::System(select);
- if (getUpdateMechanism() == UM_LAZY) {
- modifiedSet_ = new kernel::resource::ActionLmmList();
- maxminSystem_->keep_track = modifiedSet_;
- }
+ if (getUpdateMechanism() == UM_LAZY)
+ maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet();
}
CpuCas01Model::~CpuCas01Model()
while ((var = constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
- model()->getMaxminSystem()->update_variable_bound(action->getVariable(),
+ model()->getMaxminSystem()->update_variable_bound(action->get_variable(),
action->requestedCore() * speed_.scale * speed_.peak);
}
while ((var = cnst->get_variable(&elem))) {
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
- if (action->getState() == kernel::resource::Action::State::running ||
- action->getState() == kernel::resource::Action::State::ready ||
- action->getState() == kernel::resource::Action::State::not_in_the_system) {
- action->setFinishTime(date);
- action->setState(kernel::resource::Action::State::failed);
+ if (action->get_state() == kernel::resource::Action::State::running ||
+ action->get_state() == kernel::resource::Action::State::ready ||
+ action->get_state() == kernel::resource::Action::State::not_in_the_system) {
+ action->set_finish_time(date);
+ action->set_state(kernel::resource::Action::State::failed);
}
}
}
CpuCas01Action* action = new CpuCas01Action(model(), 1.0, isOff(), speed_.scale * speed_.peak, constraint());
// FIXME: sleep variables should not consume 1.0 in System::expand()
- action->setMaxDuration(duration);
+ action->set_max_duration(duration);
action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
if (duration < 0) { // NO_MAX_DURATION
/* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */
- simgrid::xbt::intrusive_erase(*action->getStateSet(), *action);
- action->stateSet_ = &static_cast<CpuCas01Model*>(model())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
- action->getStateSet()->push_back(*action);
+ simgrid::xbt::intrusive_erase(*action->get_state_set(), *action);
+ action->state_set_ = &static_cast<CpuCas01Model*>(model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_;
+ action->get_state_set()->push_back(*action);
}
- model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0);
+ model()->getMaxminSystem()->update_variable_weight(action->get_variable(), 0.0);
if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
- action->heapRemove(model()->getActionHeap());
+ action->heapRemove();
// this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its
// max_duration correctly at the next call to share_resources
model()->getModifiedSet()->push_front(*action);
, requestedCore_(requestedCore)
{
if (model->getUpdateMechanism() == UM_LAZY) {
- refreshLastUpdate();
- setLastValue(0.0);
+ set_last_update();
+ set_last_value(0.0);
}
- model->getMaxminSystem()->expand(constraint, getVariable(), 1.0);
+ model->getMaxminSystem()->expand(constraint, get_variable(), 1.0);
}
CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,