-/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2023. 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. */
+#include "src/kernel/lmm/fair_bottleneck.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#if SIMGRID_HAVE_EIGEN3
#include "src/kernel/lmm/bmf.hpp"
double sg_surf_precision = 1E-9; /* Change this with --cfg=surf/precision:VALUE */
int sg_concurrency_limit = -1; /* Change this with --cfg=maxmin/concurrency-limit:VALUE */
-namespace simgrid {
-namespace kernel {
-namespace lmm {
-
-using dyn_light_t = std::vector<int>;
+namespace simgrid::kernel::lmm {
int Variable::next_rank_ = 1;
int Constraint::next_rank_ = 1;
int Element::get_concurrency() const
{
+ // just to try having the computation of the concurrency
+ if (constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
+ return 1;
+ }
+
// Ignore element with weight less than one (e.g. cross-traffic)
return (consumption_weight >= 1) ? 1 : 0;
// There are other alternatives, but they will change the behavior of the model..
constraint->concurrency_current_ -= get_concurrency();
}
-void Element::increase_concurrency()
+void Element::increase_concurrency(bool check_limit)
{
constraint->concurrency_current_ += get_concurrency();
if (constraint->concurrency_current_ > constraint->concurrency_maximum_)
constraint->concurrency_maximum_ = constraint->concurrency_current_;
- xbt_assert(constraint->get_concurrency_limit() < 0 ||
+ xbt_assert(not check_limit || constraint->get_concurrency_limit() < 0 ||
constraint->concurrency_current_ <= constraint->get_concurrency_limit(),
"Concurrency limit overflow!");
}
-System* System::build(const std::string& solver_name, bool selective_update)
+System* System::build(std::string_view solver_name, bool selective_update)
{
System* system = nullptr;
if (solver_name == "bmf") {
#if SIMGRID_HAVE_EIGEN3
- system = new lmm::BmfSystem(selective_update);
+ system = new BmfSystem(selective_update);
#endif
} else if (solver_name == "fairbottleneck") {
system = new FairBottleneck(selective_update);
} else {
- system = new System(selective_update);
+ system = new MaxMin(selective_update);
}
return system;
}
for (Element const& elem : cnst.disabled_element_set_) {
// We should have staged variables only if concurrency is reached in some constraint
- xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_penalty_ == 0 ||
- elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share_,
+ xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_sharing_penalty_ == 0 ||
+ elem.variable->get_min_concurrency_slack() == 0,
"should not have staged variable!");
}
// TODOLATER Can do better than that by leaving only the variable in only one enabled_element_set, call
// update_modified_set, and then remove it..
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
for (Element& elem : var->cnsts_) {
if (var->sharing_penalty_ > 0)
System::~System()
{
while (Variable* var = extract_variable()) {
- std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
- XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
- var->rank_);
+ const char* name = var->id_ ? typeid(*var->id_).name() : "(unidentified)";
+ boost::core::scoped_demangled_name demangled(name);
+ XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.",
+ demangled.get() ? demangled.get() : name, var->rank_);
var_free(var);
}
while (Constraint* cnst = extract_constraint())
variable_free(var);
}
-void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
+Element& System::expand_create_elem(Constraint* cnst, Variable* var, double consumption_weight)
{
- modified_ = true;
-
- // Check if this variable already has an active element in this constraint
- // If it does, subtract it from the required slack
- int current_share = 0;
- if (var->concurrency_share_ > 1) {
- for (const Element& elem : var->cnsts_) {
- if (elem.constraint == cnst && elem.enabled_element_set_hook.is_linked())
- current_share += elem.get_concurrency();
- }
- }
-
- // Check if we need to disable the variable
- if (var->sharing_penalty_ > 0 && var->concurrency_share_ - current_share > cnst->get_concurrency_slack()) {
- double penalty = var->sharing_penalty_;
- disable_var(var);
- for (Element const& elem : var->cnsts_)
- on_disabled_var(elem.constraint);
- consumption_weight = 0;
- var->staged_penalty_ = penalty;
- xbt_assert(not var->sharing_penalty_);
- }
-
xbt_assert(var->cnsts_.size() < var->cnsts_.capacity(), "Too much constraints");
var->cnsts_.emplace_back(cnst, var, consumption_weight);
if (var->sharing_penalty_ != 0.0) {
elem.constraint->enabled_element_set_.push_front(elem);
- elem.increase_concurrency();
} else
elem.constraint->disabled_element_set_.push_back(elem);
- if (not selective_update_active) {
- make_constraint_active(cnst);
- } else if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0) {
+ if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0) {
make_constraint_active(cnst);
- update_modified_set(cnst);
- // TODOLATER: Why do we need this second call?
- if (var->cnsts_.size() > 1)
- update_modified_set(var->cnsts_[0].constraint);
}
+ return elem;
+}
- check_concurrency();
+Element& System::expand_add_to_elem(Element& elem, const Constraint* cnst, double consumption_weight) const
+{
+ elem.max_consumption_weight = std::max(elem.max_consumption_weight, consumption_weight);
+ if (cnst->sharing_policy_ != Constraint::SharingPolicy::FATPIPE)
+ elem.consumption_weight += consumption_weight;
+ else
+ elem.consumption_weight = std::max(elem.consumption_weight, consumption_weight);
+ return elem;
}
-void System::expand_add(Constraint* cnst, Variable* var, double value)
+void System::expand(Constraint* cnst, Variable* var, double consumption_weight, bool force_creation)
{
modified_ = true;
- check_concurrency();
-
- // BEWARE: In case you have multiple elements in one constraint, this will always add value to the first element.
auto elem_it =
std::find_if(begin(var->cnsts_), end(var->cnsts_), [&cnst](Element const& x) { return x.constraint == cnst; });
- if (elem_it != end(var->cnsts_)) {
- Element& elem = *elem_it;
- if (var->sharing_penalty_ != 0.0)
- elem.decrease_concurrency();
- elem.max_consumption_weight = std::max(elem.max_consumption_weight, value);
- if (cnst->sharing_policy_ != Constraint::SharingPolicy::FATPIPE)
- elem.consumption_weight += value;
- else
- elem.consumption_weight = std::max(elem.consumption_weight, value);
-
- // We need to check that increasing value of the element does not cross the concurrency limit
- if (var->sharing_penalty_ != 0.0) {
- if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
- double penalty = var->sharing_penalty_;
- disable_var(var);
- for (Element const& elem2 : var->cnsts_)
- on_disabled_var(elem2.constraint);
- var->staged_penalty_ = penalty;
- xbt_assert(not var->sharing_penalty_);
- }
- elem.increase_concurrency();
+ bool reuse_elem = elem_it != end(var->cnsts_) && not force_creation;
+ if (reuse_elem && var->sharing_penalty_ != 0.0) {
+ /* before changing it, decreases concurrency on constraint, it'll be added back later */
+ elem_it->decrease_concurrency();
+ }
+ Element& elem = reuse_elem ? expand_add_to_elem(*elem_it, cnst, consumption_weight)
+ : expand_create_elem(cnst, var, consumption_weight);
+
+ // Check if we need to disable the variable
+ if (var->sharing_penalty_ != 0) {
+ /* increase concurrency in constraint that this element uses.
+ * as we don't check if constraint has reached its limit before increasing,
+ * we can't check the correct state at increase_concurrency, anyway
+ * it'll check if the slack is smaller than 0 just below */
+ elem.increase_concurrency(false);
+ if (cnst->get_concurrency_slack() < 0) {
+ double penalty = var->sharing_penalty_;
+ disable_var(var);
+ for (Element const& elem2 : var->cnsts_)
+ on_disabled_var(elem2.constraint);
+ var->staged_sharing_penalty_ = penalty;
+ xbt_assert(not var->sharing_penalty_);
}
- update_modified_set(cnst);
- } else
- expand(cnst, var, value);
+ }
+
+ /* update modified constraint set accordingly */
+ if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0)
+ update_modified_cnst_set(cnst);
check_concurrency();
}
*elem = &enabled_element_set_.front();
else if (not disabled_element_set_.empty())
*elem = &disabled_element_set_.front();
- else
- *elem = nullptr;
} else {
// elem is not null, so we carry on
if ((*elem)->enabled_element_set_hook.is_linked()) {
*elem = &enabled_element_set_.front();
else if (not disabled_element_set_.empty())
*elem = &disabled_element_set_.front();
- else
- *elem = nullptr;
} else {
*elem = *nextelem;
if (*numelem > 0) {
return nullptr;
}
-static inline void saturated_constraints_update(double usage, int cnst_light_num, dyn_light_t& saturated_constraints,
- double* min_usage)
-{
- xbt_assert(usage > 0, "Impossible");
-
- if (*min_usage < 0 || *min_usage > usage) {
- *min_usage = usage;
- XBT_HERE(" min_usage=%f (cnst->remaining / cnst->usage =%f)", *min_usage, usage);
- saturated_constraints.assign(1, cnst_light_num);
- } else if (*min_usage == usage) {
- saturated_constraints.emplace_back(cnst_light_num);
- }
-}
-
-static inline void saturated_variable_set_update(const ConstraintLight* cnst_light_tab,
- const dyn_light_t& saturated_constraints, System* sys)
-{
- /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate
- * (cnst_light_tab)*/
- for (int const& saturated_cnst : saturated_constraints) {
- const ConstraintLight& cnst = cnst_light_tab[saturated_cnst];
- for (Element const& elem : cnst.cnst->active_element_set_) {
- xbt_assert(elem.variable->sharing_penalty_ > 0); // All elements of active_element_set should be active
- if (elem.consumption_weight > 0 && not elem.variable->saturated_variable_set_hook_.is_linked())
- sys->saturated_variable_set.push_back(*elem.variable);
- }
- }
-}
-
template <class ElemList>
static void format_element_list(const ElemList& elem_list, Constraint::SharingPolicy sharing_policy, double& sum,
std::string& buf)
}
}
-void System::lmm_solve()
+resource::Action::ModifiedSet* System::get_modified_action_set() const
{
- if (modified_) {
- XBT_IN("(sys=%p)", this);
- /* Compute Usage and store the variables that reach the maximum. If selective_update_active is true, only
- * constraints that changed are considered. Otherwise all constraints with active actions are considered.
- */
- if (selective_update_active)
- lmm_solve(modified_constraint_set);
- else
- lmm_solve(active_constraint_set);
- XBT_OUT();
- }
+ return modified_set_.get();
}
-template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
+void System::solve()
{
- double min_usage = -1;
- double min_bound = -1;
-
- XBT_DEBUG("Active constraints : %zu", cnst_list.size());
- cnst_light_vec.reserve(cnst_list.size());
- ConstraintLight* cnst_light_tab = cnst_light_vec.data();
- int cnst_light_num = 0;
-
- for (Constraint& cnst : cnst_list) {
- /* INIT: Collect constraints that actually need to be saturated (i.e remaining and usage are strictly positive)
- * into cnst_light_tab. */
- cnst.dynamic_bound_ = cnst.bound_;
- if (cnst.get_sharing_policy() == Constraint::SharingPolicy::NONLINEAR && cnst.dyn_constraint_cb_) {
- cnst.dynamic_bound_ = cnst.dyn_constraint_cb_(cnst.bound_, cnst.concurrency_current_);
- }
- cnst.remaining_ = cnst.dynamic_bound_;
- if (not double_positive(cnst.remaining_, cnst.dynamic_bound_ * sg_maxmin_precision))
- continue;
- cnst.usage_ = 0;
- for (Element& elem : cnst.enabled_element_set_) {
- xbt_assert(elem.variable->sharing_penalty_ > 0.0);
- elem.variable->value_ = 0.0;
- if (elem.consumption_weight > 0) {
- if (cnst.sharing_policy_ != Constraint::SharingPolicy::FATPIPE)
- cnst.usage_ += elem.consumption_weight / elem.variable->sharing_penalty_;
- else if (cnst.usage_ < elem.consumption_weight / elem.variable->sharing_penalty_)
- cnst.usage_ = elem.consumption_weight / elem.variable->sharing_penalty_;
-
- elem.make_active();
- resource::Action* action = elem.variable->id_;
- if (modified_set_ && not action->is_within_modified_set())
- modified_set_->push_back(*action);
- }
- }
- XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst.rank_, cnst.usage_,
- cnst.remaining_, cnst.concurrency_current_, cnst.concurrency_maximum_, cnst.get_concurrency_limit());
- /* Saturated constraints update */
-
- if (cnst.usage_ > 0) {
- cnst_light_tab[cnst_light_num].cnst = &cnst;
- cnst.cnst_light_ = &cnst_light_tab[cnst_light_num];
- cnst_light_tab[cnst_light_num].remaining_over_usage = cnst.remaining_ / cnst.usage_;
- saturated_constraints_update(cnst_light_tab[cnst_light_num].remaining_over_usage, cnst_light_num,
- saturated_constraints, &min_usage);
- xbt_assert(not cnst.active_element_set_.empty(),
- "There is no sense adding a constraint that has no active element!");
- cnst_light_num++;
- }
- }
+ if (not modified_)
+ return;
- saturated_variable_set_update(cnst_light_tab, saturated_constraints, this);
-
- /* Saturated variables update */
- do {
- /* Fix the variables that have to be */
- auto& var_list = saturated_variable_set;
- for (Variable const& var : var_list) {
- if (var.sharing_penalty_ <= 0.0)
- DIE_IMPOSSIBLE;
- /* First check if some of these variables could reach their upper bound and update min_bound accordingly. */
- XBT_DEBUG("var=%d, var.bound=%f, var.penalty=%f, min_usage=%f, var.bound*var.penalty=%f", var.rank_, var.bound_,
- var.sharing_penalty_, min_usage, var.bound_ * var.sharing_penalty_);
- if ((var.bound_ > 0) && (var.bound_ * var.sharing_penalty_ < min_usage)) {
- if (min_bound < 0)
- min_bound = var.bound_ * var.sharing_penalty_;
- else
- min_bound = std::min(min_bound, (var.bound_ * var.sharing_penalty_));
- XBT_DEBUG("Updated min_bound=%f", min_bound);
- }
- }
+ do_solve();
- while (not var_list.empty()) {
- Variable& var = var_list.front();
- if (min_bound < 0) {
- // If no variable could reach its bound, deal iteratively the constraints usage ( at worst one constraint is
- // saturated at each cycle)
- var.value_ = min_usage / var.sharing_penalty_;
- XBT_DEBUG("Setting var (%d) value to %f\n", var.rank_, var.value_);
- } else {
- // If there exist a variable that can reach its bound, only update it (and other with the same bound) for now.
- if (double_equals(min_bound, var.bound_ * var.sharing_penalty_, sg_maxmin_precision)) {
- var.value_ = var.bound_;
- XBT_DEBUG("Setting %p (%d) value to %f\n", &var, var.rank_, var.value_);
- } else {
- // Variables which bound is different are not considered for this cycle, but they will be afterwards.
- XBT_DEBUG("Do not consider %p (%d)\n", &var, var.rank_);
- var_list.pop_front();
- continue;
- }
- }
- XBT_DEBUG("Min usage: %f, Var(%d).penalty: %f, Var(%d).value: %f", min_usage, var.rank_, var.sharing_penalty_,
- var.rank_, var.value_);
-
- /* Update the usage of constraints where this variable is involved */
- for (Element& elem : var.cnsts_) {
- Constraint* cnst = elem.constraint;
- if (cnst->sharing_policy_ != Constraint::SharingPolicy::FATPIPE) {
- // Remember: shared constraints require that sum(elem.value * var.value) < cnst->bound
- double_update(&(cnst->remaining_), elem.consumption_weight * var.value_,
- cnst->dynamic_bound_ * sg_maxmin_precision);
- double_update(&(cnst->usage_), elem.consumption_weight / var.sharing_penalty_, sg_maxmin_precision);
- // If the constraint is saturated, remove it from the set of active constraints (light_tab)
- if (not double_positive(cnst->usage_, sg_maxmin_precision) ||
- not double_positive(cnst->remaining_, cnst->dynamic_bound_ * sg_maxmin_precision)) {
- if (cnst->cnst_light_) {
- size_t index = (cnst->cnst_light_ - cnst_light_tab);
- XBT_DEBUG("index: %zu \t cnst_light_num: %d \t || usage: %f remaining: %f bound: %f", index,
- cnst_light_num, cnst->usage_, cnst->remaining_, cnst->dynamic_bound_);
- cnst_light_tab[index] = cnst_light_tab[cnst_light_num - 1];
- cnst_light_tab[index].cnst->cnst_light_ = &cnst_light_tab[index];
- cnst_light_num--;
- cnst->cnst_light_ = nullptr;
- }
- } else {
- if (cnst->cnst_light_) {
- cnst->cnst_light_->remaining_over_usage = cnst->remaining_ / cnst->usage_;
- }
- }
- elem.make_inactive();
- } else {
- // Remember: non-shared constraints only require that max(elem.value * var.value) < cnst->bound
- cnst->usage_ = 0.0;
- elem.make_inactive();
- for (const Element& elem2 : cnst->enabled_element_set_) {
- xbt_assert(elem2.variable->sharing_penalty_ > 0);
- if (elem2.variable->value_ > 0)
- continue;
- if (elem2.consumption_weight > 0)
- cnst->usage_ = std::max(cnst->usage_, elem2.consumption_weight / elem2.variable->sharing_penalty_);
- }
- // If the constraint is saturated, remove it from the set of active constraints (light_tab)
- if (not double_positive(cnst->usage_, sg_maxmin_precision) ||
- not double_positive(cnst->remaining_, cnst->dynamic_bound_ * sg_maxmin_precision)) {
- if (cnst->cnst_light_) {
- size_t index = (cnst->cnst_light_ - cnst_light_tab);
- XBT_DEBUG("index: %zu \t cnst_light_num: %d \t || \t cnst: %p \t cnst->cnst_light: %p "
- "\t cnst_light_tab: %p usage: %f remaining: %f bound: %f",
- index, cnst_light_num, cnst, cnst->cnst_light_, cnst_light_tab, cnst->usage_, cnst->remaining_,
- cnst->dynamic_bound_);
- cnst_light_tab[index] = cnst_light_tab[cnst_light_num - 1];
- cnst_light_tab[index].cnst->cnst_light_ = &cnst_light_tab[index];
- cnst_light_num--;
- cnst->cnst_light_ = nullptr;
- }
- } else {
- if (cnst->cnst_light_) {
- cnst->cnst_light_->remaining_over_usage = cnst->remaining_ / cnst->usage_;
- xbt_assert(not cnst->active_element_set_.empty(),
- "Should not keep a maximum constraint that has no active"
- " element! You want to check the maxmin precision and possible rounding effects.");
- }
- }
+ modified_ = false;
+ if (selective_update_active) {
+ /* update list of modified variables */
+ for (const Constraint& cnst : modified_constraint_set) {
+ for (const Element& elem : cnst.enabled_element_set_) {
+ if (elem.consumption_weight > 0) {
+ resource::Action* action = elem.variable->id_;
+ if (not action->is_within_modified_set())
+ modified_set_->push_back(*action);
}
}
- var_list.pop_front();
}
-
- /* Find out which variables reach the maximum */
- min_usage = -1;
- min_bound = -1;
- saturated_constraints.clear();
- for (int pos = 0; pos < cnst_light_num; pos++) {
- xbt_assert(not cnst_light_tab[pos].cnst->active_element_set_.empty(),
- "Cannot saturate more a constraint that has"
- " no active element! You may want to change the maxmin precision (--cfg=maxmin/precision:<new_value>)"
- " because of possible rounding effects.\n\tFor the record, the usage of this constraint is %g while "
- "the maxmin precision to which it is compared is %g.\n\tThe usage of the previous constraint is %g.",
- cnst_light_tab[pos].cnst->usage_, sg_maxmin_precision, cnst_light_tab[pos - 1].cnst->usage_);
- saturated_constraints_update(cnst_light_tab[pos].remaining_over_usage, pos, saturated_constraints, &min_usage);
- }
-
- saturated_variable_set_update(cnst_light_tab, saturated_constraints, this);
- } while (cnst_light_num > 0);
-
- modified_ = false;
- if (selective_update_active)
- remove_all_modified_set();
+ /* clear list of modified constraint */
+ remove_all_modified_cnst_set();
+ }
if (XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug)) {
print();
modified_ = true;
var->bound_ = bound;
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ if (not var->cnsts_.empty()) {
+ for (Element const& elem : var->cnsts_) {
+ update_modified_cnst_set(elem.constraint);
+ }
+ }
}
void Variable::initialize(resource::Action* id_value, double sharing_penalty, double bound_value,
rank_ = next_rank_++;
cnsts_.reserve(number_of_constraints);
sharing_penalty_ = sharing_penalty;
- staged_penalty_ = 0.0;
+ staged_sharing_penalty_ = 0.0;
bound_ = bound_value;
- concurrency_share_ = 1;
value_ = 0.0;
visited_ = visited_value;
mu_ = 0.0;
}
// Small remark: In this implementation of System::enable_var() and System::disable_var(), we will meet multiple times
-// with var when running System::update_modified_set().
-// A priori not a big performance issue, but we might do better by calling System::update_modified_set() within the for
-// loops (after doing the first for enabling==1, and before doing the last for disabling==1)
+// with var when running System::update_modified_cnst_set().
+// A priori not a big performance issue, but we might do better by calling System::update_modified_cnst_set() within the
+// for loops (after doing the first for enabling==1, and before doing the last for disabling==1)
void System::enable_var(Variable* var)
{
xbt_assert(not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug) || var->can_enable());
- var->sharing_penalty_ = var->staged_penalty_;
- var->staged_penalty_ = 0;
+ var->sharing_penalty_ = var->staged_sharing_penalty_;
+ var->staged_sharing_penalty_ = 0;
- // Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_set AFTER
+ // Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_cnst_set AFTER
// moving at least one element of var.
simgrid::xbt::intrusive_erase(variable_set, *var);
elem.constraint->enabled_element_set_.push_front(elem);
elem.increase_concurrency();
}
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
// When used within on_disabled_var, we would get an assertion fail, because transiently there can be variables
// that are staged and could be activated.
void System::disable_var(Variable* var)
{
- xbt_assert(not var->staged_penalty_, "Staged penalty should have been cleared");
- // Disabling the variable, move to var to list tail. Subtlety is: here, we need to call update_modified_set
+ xbt_assert(not var->staged_sharing_penalty_, "Staged penalty should have been cleared");
+ // Disabling the variable, move to var to list tail. Subtlety is: here, we need to call update_modified_cnst_set
// BEFORE moving the last element of var.
simgrid::xbt::intrusive_erase(variable_set, *var);
variable_set.push_back(*var);
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
for (Element& elem : var->cnsts_) {
simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set_, elem);
elem.constraint->disabled_element_set_.push_back(elem);
}
var->sharing_penalty_ = 0.0;
- var->staged_penalty_ = 0.0;
+ var->staged_sharing_penalty_ = 0.0;
var->value_ = 0.0;
check_concurrency();
}
nextelem = nullptr;
}
- if (elem->variable->staged_penalty_ > 0 && elem->variable->can_enable()) {
+ if (elem->variable->staged_sharing_penalty_ > 0 && elem->variable->can_enable()) {
// Found a staged variable
// TODOLATER: Add random timing function to model reservation protocol fuzziness? Then how to make sure that
// staged variables will eventually be called?
// Are we enabling this variable?
if (enabling_var) {
- var->staged_penalty_ = penalty;
+ var->staged_sharing_penalty_ = penalty;
int minslack = var->get_min_concurrency_slack();
- if (minslack < var->concurrency_share_) {
- XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack %i, with penalty %f and concurrency"
- " share %i",
- minslack, penalty, var->concurrency_share_);
+ if (minslack == 0) {
+ XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack is 0");
return;
}
XBT_DEBUG("Enabling var with min concurrency slack %i", minslack);
disable_var(var);
} else {
var->sharing_penalty_ = penalty;
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
}
check_concurrency();
void System::update_constraint_bound(Constraint* cnst, double bound)
{
modified_ = true;
- update_modified_set(cnst);
+ update_modified_cnst_set(cnst);
cnst->bound_ = bound;
}
* A recursive algorithm to optimize the system recalculation selecting only constraints that have changed. Each
* constraint change is propagated to the list of constraints for each variable.
*/
-void System::update_modified_set_rec(const Constraint* cnst)
+void System::update_modified_cnst_set_rec(const Constraint* cnst)
{
for (Element const& elem : cnst->enabled_element_set_) {
Variable* var = elem.variable;
break;
if (elem2.constraint != cnst && not elem2.constraint->modified_constraint_set_hook_.is_linked()) {
modified_constraint_set.push_back(*elem2.constraint);
- update_modified_set_rec(elem2.constraint);
+ update_modified_cnst_set_rec(elem2.constraint);
}
}
// var will be ignored in later visits as long as sys->visited_counter does not move
}
}
-void System::update_modified_set(Constraint* cnst)
+void System::update_modified_cnst_set_from_variable(const Variable* var)
+{
+ /* nothing to update in these cases:
+ * - selective update not active, all variables are active
+ * - variable doesn't use any constraint
+ * - variable is disabled (sharing penalty <= 0): we iterate only through the enabled_variables in
+ * update_modified_cnst_set_rec */
+ if (not selective_update_active || var->cnsts_.empty() || var->sharing_penalty_ <= 0)
+ return;
+
+ /* Normally, if the conditions above are true, specially variable is enabled, we can call
+ * modified_set over the first contraint only, since the recursion in update_modified_cnst_set_rec
+ * will iterate over the other constraints of this variable */
+ update_modified_cnst_set(var->cnsts_[0].constraint);
+}
+
+void System::update_modified_cnst_set(Constraint* cnst)
{
/* nothing to do if selective update isn't active */
if (selective_update_active && not cnst->modified_constraint_set_hook_.is_linked()) {
modified_constraint_set.push_back(*cnst);
- update_modified_set_rec(cnst);
+ update_modified_cnst_set_rec(cnst);
}
}
-void System::remove_all_modified_set()
+void System::remove_all_modified_cnst_set()
{
// We cleverly un-flag all variables just by incrementing visited_counter
// In effect, the var->visited value will no more be equal to visited counter
return result;
}
-int Constraint::get_variable_amount() const
-{
- return static_cast<int>(std::count_if(std::begin(enabled_element_set_), std::end(enabled_element_set_),
- [](const Element& elem) { return elem.consumption_weight > 0; }));
-}
-
void Constraint::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb)
{
- xbt_assert(policy == SharingPolicy::NONLINEAR || not cb,
+ xbt_assert(policy == SharingPolicy::NONLINEAR || policy == SharingPolicy::WIFI || not cb,
"Invalid sharing policy for constraint. Callback should be used with NONLINEAR sharing policy");
sharing_policy_ = policy;
dyn_constraint_cb_ = cb;
}
-} // namespace lmm
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::lmm
