X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bde09a7b53c62986d6f22b10de50dec039b4f96a..e1533d482ef3d7286eb7afc5d246b1aba8cfc1e5:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 48ba787984..557e549d78 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -64,7 +64,7 @@ CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo) bool select = config::get_value("cpu/maxmin-selective-update"); - if (algo == Model::UpdateAlgo::LAZY) { + if (is_update_lazy()) { xbt_assert(select || config::is_default("cpu/maxmin-selective-update"), "You cannot disable cpu selective update when using the lazy update mechanism"); select = true; @@ -133,7 +133,7 @@ void CpuCas01::apply_event(profile::Event* event, double value) if (value > 0) { if (not is_on()) { - XBT_VERB("Restart processes on host %s", get_host()->get_cname()); + XBT_VERB("Restart actors on host %s", get_host()->get_cname()); get_host()->turn_on(); } } else { @@ -188,7 +188,7 @@ CpuAction* CpuCas01::sleep(double duration) action->set_state(Action::State::IGNORED); 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 + if (get_model()->is_update_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 // max_duration correctly at the next call to share_resources @@ -208,7 +208,7 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1)) , requested_core_(requested_core) { - if (model->get_update_algorithm() == Model::UpdateAlgo::LAZY) + if (model->is_update_lazy()) set_last_update(); model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); }