X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fdab189916cad1bf47afa4f3c272c8ba26c36ed1..fe9f13ea487593ec11c6af50d8150a6743c84114:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 1bb85a7711..e9474159c1 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -5,6 +5,7 @@ #include "cpu_cas01.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/resource/profile/Event.hpp" #include "src/surf/cpu_ti.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -107,7 +108,7 @@ void CpuCas01::on_speed_change() get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_core_count() * speed_.scale * speed_.peak); while ((var = get_constraint()->get_variable(&elem))) { - CpuCas01Action* action = static_cast(var->get_id()); + auto* action = static_cast(var->get_id()); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), action->requested_core() * speed_.scale * speed_.peak); @@ -144,7 +145,7 @@ void CpuCas01::apply_event(profile::Event* event, double value) get_host()->turn_off(); while ((var = cnst->get_variable(&elem))) { - Action* action = static_cast(var->get_id()); + auto* action = static_cast(var->get_id()); if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED || action->get_state() == Action::State::IGNORED) { @@ -178,8 +179,7 @@ CpuAction* CpuCas01::sleep(double duration) duration = std::max(duration, sg_surf_precision); XBT_IN("(%s,%g)", get_cname(), duration); - CpuCas01Action* action = - new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint()); + auto* action = new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint()); // FIXME: sleep variables should not consume 1.0 in System::expand() action->set_max_duration(duration); @@ -187,7 +187,7 @@ CpuAction* CpuCas01::sleep(double duration) if (duration == NO_MAX_DURATION) action->set_state(Action::State::IGNORED); - get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); + get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0); if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) { // remove action from the heap get_model()->get_action_heap().remove(action); // this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its