X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d37e348a09783cda723c7019640ee69de168324..fde63ab63d776f60717181c36961cde86cb6d23d:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 0c7181333b..83a6e16d01 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -39,9 +39,7 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta) ++it; // increment iterator here since the following calls to action.finish() may invalidate it action.update_remains(action.get_variable()->get_value() * delta); - - if (action.get_max_duration() != NO_MAX_DURATION) - action.update_max_duration(delta); + action.update_max_duration(delta); if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { @@ -188,7 +186,8 @@ void CpuAction::set_state(Action::State state) } /** @brief returns a list of all CPUs that this action is using */ -std::list CpuAction::cpus() { +std::list CpuAction::cpus() const +{ std::list retlist; int llen = get_variable()->get_number_of_constraint();