xbt_assert(!surf_cpu_model_pm);
xbt_assert(!surf_cpu_model_vm);
- char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
+ char *optim = xbt_cfg_get_string("cpu/optim");
if (!strcmp(optim, "TI")) {
surf_cpu_model_init_ti();
return;
CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
{
- char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
- int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
+ char *optim = xbt_cfg_get_string("cpu/optim");
+ int select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
if (!strcmp(optim, "Full")) {
updateMechanism_ = UM_FULL;
updateMechanism_ = UM_LAZY;
selectiveUpdate_ = 1;
xbt_assert((select == 1)
- ||
- (xbt_cfg_is_default_value
- (_sg_cfg_set, "cpu/maxmin_selective_update")),
+ || (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);
maxminSystem_ = lmm_system_new(selectiveUpdate_);
if (getUpdateMechanism() == UM_LAZY) {
- actionHeap_ = xbt_heap_new(8, NULL);
+ actionHeap_ = xbt_heap_new(8, nullptr);
xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap);
modifiedSet_ = new ActionLmmList();
maxminSystem_->keep_track = modifiedSet_;
CpuCas01Model::~CpuCas01Model()
{
lmm_system_free(maxminSystem_);
- maxminSystem_ = NULL;
-
- if (actionHeap_)
- xbt_heap_free(actionHeap_);
+ maxminSystem_ = nullptr;
+ xbt_heap_free(actionHeap_);
delete modifiedSet_;
- surf_cpu_model_pm = NULL;
+ surf_cpu_model_pm = nullptr;
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::onSpeedChange() {
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
coresAmount_ * speed_.scale * speed_.peak);
turnOn();
} else {
lmm_constraint_t cnst = getConstraint();
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
+ lmm_variable_t var = nullptr;
+ lmm_element_t elem = nullptr;
double date = surf_get_clock();
turnOff();
while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) {
Action *action = static_cast<Action*>(lmm_variable_id(var));
- if (action->getState() == SURF_ACTION_RUNNING ||
- action->getState() == SURF_ACTION_READY ||
- action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ if (action->getState() == Action::State::running ||
+ action->getState() == Action::State::ready ||
+ action->getState() == Action::State::not_in_the_system) {
action->setFinishTime(date);
- action->setState(SURF_ACTION_FAILED);
+ action->setState(Action::State::failed);
}
}
}
speed_.scale * speed_.peak, getConstraint());
// FIXME: sleep variables should not consume 1.0 in lmm_expand
- action->m_maxDuration = duration;
- action->m_suspended = 2;
+ action->maxDuration_ = duration;
+ action->suspended_ = 2;
if (duration == NO_MAX_DURATION) {
/* Move to the *end* of the corresponding action set. This convention
is used to speed up update_resource_state */
action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
- action->p_stateSet = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ action->stateSet_ = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
action->getStateSet()->push_back(*action);
}
1.0, speed, 1))
{
if (model->getUpdateMechanism() == UM_LAZY) {
- m_indexHeap = -1;
- m_lastUpdate = surf_get_clock();
- m_lastValue = 0.0;
+ indexHeap_ = -1;
+ lastUpdate_ = surf_get_clock();
+ lastValue_ = 0.0;
}
lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
}
+CpuCas01Action::~CpuCas01Action() {}
+
}
}