#include "cpu_cas01.hpp"
#include "cpu_ti.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "xbt/utility.hpp"
#include <algorithm>
bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
if (optim == "Full") {
- setUpdateMechanism(UM_FULL);
+ setUpdateMechanism(Model::UpdateAlgo::Full);
} else if (optim == "Lazy") {
- setUpdateMechanism(UM_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");
+ setUpdateMechanism(Model::UpdateAlgo::Lazy);
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());
}
- maxmin_system_ = new simgrid::kernel::lmm::System(select);
+ set_maxmin_system(new simgrid::kernel::lmm::System(select));
- if (getUpdateMechanism() == UM_LAZY)
- maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet();
+ if (getUpdateMechanism() == Model::UpdateAlgo::Lazy)
+ get_maxmin_system()->modified_set_ = new kernel::resource::Action::ModifiedSet();
}
CpuCas01Model::~CpuCas01Model()
* 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) */
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();
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->setFinishTime(date);
+ 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);
+ simgrid::xbt::intrusive_erase(*action->get_state_set(), *action);
action->state_set_ = &static_cast<CpuCas01Model*>(model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_;
- action->getStateSet()->push_back(*action);
+ action->get_state_set()->push_back(*action);
}
- model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0);
- if (model()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
- action->heapRemove(model()->getActionHeap());
+ model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
+ if (model()->getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap
+ 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();
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);
+ if (model->getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) {
+ 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(kernel::resource::Model* model, double cost, bool failed, double speed,