X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..eefc25aa1c98cbb7458cbf5d38007470e3bef7d0:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 2ffe199424..4d6329f18a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -60,10 +60,10 @@ namespace surf { CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { - bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); if (algo == Model::UpdateAlgo::Lazy) { - xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"), + xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"), "You cannot disable cpu selective update when using the lazy update mechanism"); select = true; } @@ -93,11 +93,11 @@ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector * CpuCas01::getSpeedPeakList(){ - return &speedPerPstate_; + return &speed_per_pstate_; } bool CpuCas01::is_used() @@ -111,12 +111,12 @@ void CpuCas01::onSpeedChange() { 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(var->get_id()); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), - action->requestedCore() * speed_.scale * speed_.peak); + action->requested_core() * speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -126,19 +126,19 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) { 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(); @@ -151,15 +151,15 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) while ((var = cnst->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); - 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) { + 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"); @@ -172,9 +172,9 @@ CpuAction* CpuCas01::execution_start(double size) return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint()); } -CpuAction* CpuCas01::execution_start(double size, int requestedCores) +CpuAction* CpuCas01::execution_start(double size, int requested_cores) { - return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requestedCores); + return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores); } CpuAction *CpuCas01::sleep(double duration) @@ -188,12 +188,8 @@ CpuAction *CpuCas01::sleep(double duration) // 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(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 @@ -211,27 +207,25 @@ CpuAction *CpuCas01::sleep(double duration) * Action * **********/ CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, - kernel::lmm::Constraint* constraint, int requestedCore) + kernel::lmm::Constraint* constraint, int requested_core) : CpuAction(model, cost, failed, - model->get_maxmin_system()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1)) - , requestedCore_(requestedCore) + model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1)) + , requested_core_(requested_core) { - if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { + if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) set_last_update(); - set_last_value(0.0); - } model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint) - : CpuCas01Action(model, cost, failed, speed, constraint, 1) + : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) { } -int CpuCas01Action::requestedCore() +int CpuCas01Action::requested_core() { - return requestedCore_; + return requested_core_; } CpuCas01Action::~CpuCas01Action()=default;