CpuCas01::~CpuCas01()
{
if (get_model() == surf_cpu_model_pm)
- speedPerPstate_.clear();
+ speed_per_pstate_.clear();
}
std::vector<double> * CpuCas01::getSpeedPeakList(){
- return &speedPerPstate_;
+ return &speed_per_pstate_;
}
bool CpuCas01::is_used()
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
- coresAmount_ * speed_.scale * speed_.peak);
+ cores_count_ * speed_.scale * speed_.peak);
while ((var = get_constraint()->get_variable(&elem))) {
CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(coresAmount_ == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+ xbt_assert(cores_count_ == 1, "FIXME: add speed scaling code also for constraint_core[i]");
speed_.scale = value;
onSpeedChange();
tmgr_trace_event_unref(&speed_.event);
- } else if (event == stateEvent_) {
+ } else if (event == state_event_) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
- xbt_assert(coresAmount_ == 1, "FIXME: add state change code also for constraint_core[i]");
+ xbt_assert(cores_count_ == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
if (is_off())
- host_that_restart.push_back(getHost());
+ host_that_restart.push_back(get_host());
turn_on();
} else {
kernel::lmm::Constraint* cnst = get_constraint();
while ((var = cnst->get_variable(&elem))) {
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
- if (action->get_state() == kernel::resource::Action::State::inited ||
- action->get_state() == kernel::resource::Action::State::running ||
- action->get_state() == kernel::resource::Action::State::ignored) {
+ if (action->get_state() == kernel::resource::Action::State::INITED ||
+ action->get_state() == kernel::resource::Action::State::STARTED ||
+ action->get_state() == kernel::resource::Action::State::IGNORED) {
action->set_finish_time(date);
- action->set_state(kernel::resource::Action::State::failed);
+ action->set_state(kernel::resource::Action::State::FAILED);
}
}
}
- tmgr_trace_event_unref(&stateEvent_);
+ tmgr_trace_event_unref(&state_event_);
} else {
xbt_die("Unknown event!\n");
// FIXME: sleep variables should not consume 1.0 in System::expand()
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->get_state_set(), *action);
- action->state_set_ = &static_cast<CpuCas01Model*>(get_model())->cpuRunningActionSetThatDoesNotNeedBeingChecked_;
- action->get_state_set()->push_back(*action);
- }
+ if (duration < 0) // NO_MAX_DURATION
+ action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap