-/* Copyright (c) 2009-2011, 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
if (optim == "Full") {
setUpdateMechanism(UM_FULL);
- selectiveUpdate_ = select;
} else if (optim == "Lazy") {
+ xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"),
+ "You cannot disable cpu selective update when using the lazy update mechanism");
+ select = true;
setUpdateMechanism(UM_LAZY);
- selectiveUpdate_ = 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 ActionLmmList();
- maxminSystem_->keep_track = modifiedSet_;
- }
+ if (getUpdateMechanism() == UM_LAZY)
+ maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet();
}
CpuCas01Model::~CpuCas01Model()
{
- delete maxminSystem_;
- maxminSystem_ = nullptr;
- delete modifiedSet_;
-
surf_cpu_model_pm = nullptr;
}
* Resource *
************/
CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<double>* speedPerPstate, int core)
- : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate,
+ : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speedPerPstate->front()), speedPerPstate,
core)
{
}
bool CpuCas01::isUsed()
{
- return model()->getMaxminSystem()->constraint_used(constraint());
+ return model()->get_maxmin_system()->constraint_used(constraint());
}
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::onSpeedChange() {
- lmm_variable_t var = nullptr;
+ kernel::lmm::Variable* var = nullptr;
const_lmm_element_t elem = nullptr;
- model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak);
+ model()->get_maxmin_system()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak);
while ((var = constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
- model()->getMaxminSystem()->update_variable_bound(action->getVariable(),
- action->requestedCore() * speed_.scale * speed_.peak);
+ model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
+ action->requestedCore() * speed_.scale * speed_.peak);
}
Cpu::onSpeedChange();
host_that_restart.push_back(getHost());
turnOn();
} else {
- lmm_constraint_t cnst = constraint();
- lmm_variable_t var = nullptr;
+ kernel::lmm::Constraint* cnst = constraint();
+ kernel::lmm::Variable* var = nullptr;
const_lmm_element_t elem = nullptr;
double date = surf_get_clock();
turnOff();
while ((var = cnst->get_variable(&elem))) {
- Action* action = static_cast<Action*>(var->get_id());
+ kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
- if (action->getState() == Action::State::running ||
- action->getState() == Action::State::ready ||
- action->getState() == Action::State::not_in_the_system) {
- action->setFinishTime(date);
- action->setState(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);
}
}
}
}
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
-CpuAction *CpuCas01::execution_start(double size)
+CpuAction* CpuCas01::execution_start(double size)
{
return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
}
+
CpuAction* CpuCas01::execution_start(double size, int requestedCores)
{
return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores);
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->suspended_ = 2;
+ 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()->get_maxmin_system()->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);
+ model()->get_modified_set()->push_front(*action);
}
XBT_OUT();
/**********
* Action *
**********/
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint,
- int requestedCore)
+CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint, int requestedCore)
: CpuAction(model, cost, failed,
- model->getMaxminSystem()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1))
+ model->get_maxmin_system()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1))
, 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->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint)
+CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint)
: CpuCas01Action(model, cost, failed, speed, constraint, 1)
{
}
