-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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/maxmin.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "xbt/backtrace.hpp"
+#include <boost/core/demangle.hpp>
+#include <typeinfo>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_lmm, kernel, "Kernel Linear Max-Min solver");
-double sg_maxmin_precision = 0.00001; /* Change this with --cfg=maxmin/precision:VALUE */
-double sg_surf_precision = 0.00001; /* Change this with --cfg=surf/precision:VALUE */
+double sg_maxmin_precision = 1E-5; /* Change this with --cfg=maxmin/precision:VALUE */
+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 {
-typedef std::vector<int> dyn_light_t;
+using dyn_light_t = std::vector<int>;
int Variable::next_rank_ = 1;
int Constraint::next_rank_ = 1;
-System* make_new_maxmin_system(bool selective_update)
-{
- return new System(selective_update);
-}
-
int Element::get_concurrency() const
{
// 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 behaviour of the model..
+ // There are other alternatives, but they will change the behavior of the model..
// So do not use it unless you want to make a new model.
// If you do, remember to change the variables concurrency share to reflect it.
// Potential examples are:
void System::check_concurrency() const
{
// These checks are very expensive, so do them only if we want to debug SURF LMM
- if (not XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug))
+ if (not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug))
return;
for (Constraint const& cnst : constraint_set) {
int concurrency = 0;
for (Element const& elem : cnst.enabled_element_set_) {
- xbt_assert(elem.variable->sharing_weight_ > 0);
+ xbt_assert(elem.variable->sharing_penalty_ > 0);
concurrency += elem.get_concurrency();
}
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_weight_ == 0 ||
+ xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_penalty_ == 0 ||
elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share_,
"should not have staged variable!");
}
continue;
const Element& elem = var.cnsts_[0];
- int belong_to_enabled = elem.enabled_element_set_hook.is_linked();
- int belong_to_disabled = elem.disabled_element_set_hook.is_linked();
- int belong_to_active = elem.active_element_set_hook.is_linked();
+ bool belong_to_enabled = elem.enabled_element_set_hook.is_linked();
+ bool belong_to_disabled = elem.disabled_element_set_hook.is_linked();
+ bool belong_to_active = elem.active_element_set_hook.is_linked();
for (Element const& elem2 : var.cnsts_) {
xbt_assert(belong_to_enabled == elem2.enabled_element_set_hook.is_linked(),
update_modified_set(var->cnsts_[0].constraint);
for (Element& elem : var->cnsts_) {
- if (var->sharing_weight_ > 0)
+ if (var->sharing_penalty_ > 0)
elem.decrease_concurrency();
if (elem.enabled_element_set_hook.is_linked())
simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set_, elem);
simgrid::xbt::intrusive_erase(elem.constraint->disabled_element_set_, elem);
if (elem.active_element_set_hook.is_linked())
simgrid::xbt::intrusive_erase(elem.constraint->active_element_set_, elem);
- int nelements = elem.constraint->enabled_element_set_.size() + elem.constraint->disabled_element_set_.size();
- if (nelements == 0)
+ if (elem.constraint->enabled_element_set_.empty() && elem.constraint->disabled_element_set_.empty())
make_constraint_inactive(elem.constraint);
else
on_disabled_var(elem.constraint);
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
if (selective_update)
- modified_set_ = new kernel::resource::Action::ModifiedSet();
+ modified_set_ = std::make_unique<kernel::resource::Action::ModifiedSet>();
}
System::~System()
{
- Variable* var;
- Constraint* cnst;
-
- while ((var = extract_variable())) {
- auto demangled = simgrid::xbt::demangle(typeid(*var->id_).name());
- XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.get(),
+ 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_);
var_free(var);
}
- while ((cnst = extract_constraint()))
+ while (Constraint* cnst = extract_constraint())
cnst_free(cnst);
xbt_mallocator_free(variable_mallocator_);
- delete modified_set_;
}
void System::cnst_free(Constraint* cnst)
delete cnst;
}
-Constraint::Constraint(void* id_value, double bound_value) : bound_(bound_value), id_(id_value)
+Constraint::Constraint(resource::Resource* id_value, double bound_value) : bound_(bound_value), id_(id_value)
{
rank_ = next_rank_++;
-
- remaining_ = 0.0;
- usage_ = 0.0;
- concurrency_limit_ = sg_concurrency_limit;
- concurrency_current_ = 0;
- concurrency_maximum_ = 0;
- sharing_policy_ = s4u::Link::SharingPolicy::SHARED;
-
- lambda_ = 0.0;
- new_lambda_ = 0.0;
- cnst_light_ = nullptr;
}
-Constraint* System::constraint_new(void* id, double bound_value)
+Constraint* System::constraint_new(resource::Resource* id, double bound_value)
{
- Constraint* cnst = new Constraint(id, bound_value);
+ auto* cnst = new Constraint(id, bound_value);
insert_constraint(cnst);
return cnst;
}
delete static_cast<Variable*>(var);
}
-Variable* System::variable_new(resource::Action* id, double sharing_weight, double bound, size_t number_of_constraints)
+Variable* System::variable_new(resource::Action* id, double sharing_penalty, double bound, size_t number_of_constraints)
{
- XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%zu)", this, id, sharing_weight, bound, number_of_constraints);
+ XBT_IN("(sys=%p, id=%p, penalty=%f, bound=%f, num_cons =%zu)", this, id, sharing_penalty, bound,
+ number_of_constraints);
- Variable* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
- var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter_ - 1);
- if (sharing_weight > 0)
+ auto* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
+ var->initialize(id, sharing_penalty, bound, number_of_constraints, visited_counter_ - 1);
+ if (sharing_penalty > 0)
variable_set.push_front(*var);
else
variable_set.push_back(*var);
var_free(var);
}
+void System::variable_free_all()
+{
+ while (Variable* var = extract_variable())
+ variable_free(var);
+}
+
void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
{
modified_ = true;
// Check if this variable already has an active element in this constraint
- // If it does, substract it from the required slack
+ // If it does, subtract it from the required slack
int current_share = 0;
if (var->concurrency_share_ > 1) {
- for (Element& elem : var->cnsts_) {
+ 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_weight_ > 0 && var->concurrency_share_ - current_share > cnst->get_concurrency_slack()) {
- double weight = var->sharing_weight_;
+ 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_weight_ = weight;
- xbt_assert(not var->sharing_weight_);
+ var->staged_penalty_ = penalty;
+ xbt_assert(not var->sharing_penalty_);
}
xbt_assert(var->cnsts_.size() < var->cnsts_.capacity(), "Too much constraints");
- var->cnsts_.resize(var->cnsts_.size() + 1);
+ var->cnsts_.emplace_back();
Element& elem = var->cnsts_.back();
elem.consumption_weight = consumption_weight;
elem.constraint = cnst;
elem.variable = var;
- if (var->sharing_weight_) {
+ if (var->sharing_penalty_ != 0.0) {
elem.constraint->enabled_element_set_.push_front(elem);
elem.increase_concurrency();
} else
if (not selective_update_active) {
make_constraint_active(cnst);
- } else if (elem.consumption_weight > 0 || var->sharing_weight_ > 0) {
+ } else 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?
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_weight_)
+ if (var->sharing_penalty_ != 0.0)
elem.decrease_concurrency();
- if (cnst->sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE)
+ 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_weight_) {
+ if (var->sharing_penalty_ != 0.0) {
if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
- double weight = var->sharing_weight_;
+ double penalty = var->sharing_penalty_;
disable_var(var);
for (Element const& elem2 : var->cnsts_)
on_disabled_var(elem2.constraint);
- var->staged_weight_ = weight;
- xbt_assert(not var->sharing_weight_);
+ var->staged_penalty_ = penalty;
+ xbt_assert(not var->sharing_penalty_);
}
elem.increase_concurrency();
}
// if we modify the list between calls, normal version may loop forever
// this safe version ensures that we browse the list elements only once
-Variable* Constraint::get_variable_safe(const Element** elem, const Element** nextelem, int* numelem) const
+Variable* Constraint::get_variable_safe(const Element** elem, const Element** nextelem, size_t* numelem) const
{
if (*elem == nullptr) {
*numelem = enabled_element_set_.size() + disabled_element_set_.size() - 1;
}
}
-static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab,
+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) {
- ConstraintLight& cnst = cnst_light_tab[saturated_cnst];
+ const ConstraintLight& cnst = cnst_light_tab[saturated_cnst];
for (Element const& elem : cnst.cnst->active_element_set_) {
- // Visiting active_element_set, so, by construction, should never get a zero weight, correct?
- xbt_assert(elem.variable->sharing_weight_ > 0);
+ 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, s4u::Link::SharingPolicy sharing_policy, double& sum,
+static void format_element_list(const ElemList& elem_list, Constraint::SharingPolicy sharing_policy, double& sum,
std::string& buf)
{
for (Element const& elem : elem_list) {
buf += std::to_string(elem.consumption_weight) + ".'" + std::to_string(elem.variable->rank_) + "'(" +
std::to_string(elem.variable->value_) + ")" +
- (sharing_policy != s4u::Link::SharingPolicy::FATPIPE ? " + " : " , ");
- if (sharing_policy != s4u::Link::SharingPolicy::FATPIPE)
+ (sharing_policy != Constraint::SharingPolicy::FATPIPE ? " + " : " , ");
+ if (sharing_policy != Constraint::SharingPolicy::FATPIPE)
sum += elem.consumption_weight * elem.variable->value_;
else
sum = std::max(sum, elem.consumption_weight * elem.variable->value_);
void System::print() const
{
- std::string buf = std::string("MAX-MIN ( ");
+ std::string buf = "MAX-MIN ( ";
/* Printing Objective */
for (Variable const& var : variable_set)
- buf += "'" + std::to_string(var.rank_) + "'(" + std::to_string(var.sharing_weight_) + ") ";
+ buf += "'" + std::to_string(var.rank_) + "'(" + std::to_string(var.sharing_penalty_) + ") ";
buf += ")";
XBT_DEBUG("%20s", buf.c_str());
buf.clear();
double sum = 0.0;
// Show the enabled variables
buf += "\t";
- buf += cnst.sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE ? "(" : "max(";
+ buf += cnst.sharing_policy_ != Constraint::SharingPolicy::FATPIPE ? "(" : "max(";
format_element_list(cnst.enabled_element_set_, cnst.sharing_policy_, sum, buf);
// TODO: Adding disabled elements only for test compatibility, but do we really want them to be printed?
format_element_list(cnst.disabled_element_set_, cnst.sharing_policy_, sum, buf);
buf += "0) <= " + std::to_string(cnst.bound_) + " ('" + std::to_string(cnst.rank_) + "')";
- if (cnst.sharing_policy_ == s4u::Link::SharingPolicy::FATPIPE) {
+ if (cnst.sharing_policy_ == Constraint::SharingPolicy::FATPIPE) {
buf += " [MAX-Constraint]";
}
XBT_DEBUG("%s", buf.c_str());
/* Printing Result */
for (Variable const& var : variable_set) {
if (var.bound_ > 0) {
- XBT_DEBUG("'%d'(%f) : %f (<=%f)", var.rank_, var.sharing_weight_, var.value_, var.bound_);
+ XBT_DEBUG("'%d'(%f) : %f (<=%f)", var.rank_, var.sharing_penalty_, var.value_, var.bound_);
xbt_assert(not double_positive(var.value_ - var.bound_, var.bound_ * sg_maxmin_precision),
"Incorrect value (%f is not smaller than %f", var.value_, var.bound_);
} else {
- XBT_DEBUG("'%d'(%f) : %f", var.rank_, var.sharing_weight_, var.value_);
+ XBT_DEBUG("'%d'(%f) : %f", var.rank_, var.sharing_penalty_, var.value_);
}
}
}
double min_bound = -1;
XBT_DEBUG("Active constraints : %zu", cnst_list.size());
- /* Init: Only modified code portions: reset the value of active variables */
- for (Constraint const& cnst : cnst_list) {
- for (Element const& elem : cnst.enabled_element_set_) {
- xbt_assert(elem.variable->sharing_weight_ > 0.0);
- elem.variable->value_ = 0.0;
- }
- }
-
- ConstraintLight* cnst_light_tab = new ConstraintLight[cnst_list.size()]();
+ cnst_light_vec.reserve(cnst_list.size());
+ ConstraintLight* cnst_light_tab = cnst_light_vec.data();
int cnst_light_num = 0;
- dyn_light_t saturated_constraints;
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.remaining_ = cnst.bound_;
- if (not double_positive(cnst.remaining_, cnst.bound_ * sg_maxmin_precision))
+ 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_weight_ > 0);
+ xbt_assert(elem.variable->sharing_penalty_ > 0.0);
+ elem.variable->value_ = 0.0;
if (elem.consumption_weight > 0) {
- if (cnst.sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE)
- cnst.usage_ += elem.consumption_weight / elem.variable->sharing_weight_;
- else if (cnst.usage_ < elem.consumption_weight / elem.variable->sharing_weight_)
- cnst.usage_ = elem.consumption_weight / elem.variable->sharing_weight_;
+ 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 = static_cast<resource::Action*>(elem.variable->id_);
+ resource::Action* action = elem.variable->id_;
if (modified_set_ && not action->is_within_modified_set())
modified_set_->push_back(*action);
}
/* Fix the variables that have to be */
auto& var_list = saturated_variable_set;
for (Variable const& var : var_list) {
- if (var.sharing_weight_ <= 0.0)
+ 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.weight=%f, min_usage=%f, var.bound*var.weight=%f", var.rank_, var.bound_,
- var.sharing_weight_, min_usage, var.bound_ * var.sharing_weight_);
- if ((var.bound_ > 0) && (var.bound_ * var.sharing_weight_ < min_usage)) {
+ 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_weight_;
+ min_bound = var.bound_ * var.sharing_penalty_;
else
- min_bound = std::min(min_bound, (var.bound_ * var.sharing_weight_));
+ min_bound = std::min(min_bound, (var.bound_ * var.sharing_penalty_));
XBT_DEBUG("Updated min_bound=%f", min_bound);
}
}
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_weight_;
+ 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_weight_, sg_maxmin_precision)) {
+ 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_);
+ XBT_DEBUG("Do not consider %p (%d)\n", &var, var.rank_);
var_list.pop_front();
continue;
}
}
- XBT_DEBUG("Min usage: %f, Var(%d).weight: %f, Var(%d).value: %f ", min_usage, var.rank_, var.sharing_weight_,
+ 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 contraints where this variable is involved */
+ /* Update the usage of constraints where this variable is involved */
for (Element& elem : var.cnsts_) {
Constraint* cnst = elem.constraint;
- if (cnst->sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE) {
+ 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->bound_ * sg_maxmin_precision);
- double_update(&(cnst->usage_), elem.consumption_weight / var.sharing_weight_, sg_maxmin_precision);
+ 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->bound_ * sg_maxmin_precision)) {
+ not double_positive(cnst->remaining_, cnst->dynamic_bound_ * sg_maxmin_precision)) {
if (cnst->cnst_light_) {
- int index = (cnst->cnst_light_ - cnst_light_tab);
- XBT_DEBUG("index: %d \t cnst_light_num: %d \t || usage: %f remaining: %f bound: %f ", index,
- cnst_light_num, cnst->usage_, cnst->remaining_, cnst->bound_);
+ 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 {
- cnst->cnst_light_->remaining_over_usage = cnst->remaining_ / cnst->usage_;
+ 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 (Element& elem2 : cnst->enabled_element_set_) {
- xbt_assert(elem2.variable->sharing_weight_ > 0);
+ 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_weight_);
+ 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->bound_ * sg_maxmin_precision)) {
+ not double_positive(cnst->remaining_, cnst->dynamic_bound_ * sg_maxmin_precision)) {
if (cnst->cnst_light_) {
- int index = (cnst->cnst_light_ - cnst_light_tab);
- XBT_DEBUG("index: %d \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 ",
+ 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->bound_);
+ 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 {
- 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.");
+ 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.");
+ }
}
}
}
min_usage = -1;
min_bound = -1;
saturated_constraints.clear();
- int pos;
- for (pos = 0; pos < cnst_light_num; pos++) {
+ 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>)"
}
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();
- if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug)) {
print();
}
check_concurrency();
-
- delete[] cnst_light_tab;
}
/** @brief Attribute the value bound to var->bound.
update_modified_set(var->cnsts_[0].constraint);
}
-void Variable::initialize(resource::Action* id_value, double sharing_weight_value, double bound_value,
- int number_of_constraints, unsigned visited_value)
+void Variable::initialize(resource::Action* id_value, double sharing_penalty, double bound_value,
+ size_t number_of_constraints, unsigned visited_value)
{
id_ = id_value;
rank_ = next_rank_++;
cnsts_.reserve(number_of_constraints);
- sharing_weight_ = sharing_weight_value;
- staged_weight_ = 0.0;
+ sharing_penalty_ = sharing_penalty;
+ staged_penalty_ = 0.0;
bound_ = bound_value;
concurrency_share_ = 1;
value_ = 0.0;
visited_ = visited_value;
mu_ = 0.0;
- new_mu_ = 0.0;
xbt_assert(not variable_set_hook_.is_linked());
xbt_assert(not saturated_variable_set_hook_.is_linked());
// 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(surf_maxmin, xbt_log_priority_debug) || var->can_enable());
+ xbt_assert(not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug) || var->can_enable());
- var->sharing_weight_ = var->staged_weight_;
- var->staged_weight_ = 0;
+ var->sharing_penalty_ = var->staged_penalty_;
+ var->staged_penalty_ = 0;
// Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_set AFTER
// moving at least one element of var.
void System::disable_var(Variable* var)
{
- xbt_assert(not var->staged_weight_, "Staged weight should have been cleared");
+ 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
// BEFORE moving the last element of var.
simgrid::xbt::intrusive_erase(variable_set, *var);
elem.decrease_concurrency();
}
- var->sharing_weight_ = 0.0;
- var->staged_weight_ = 0.0;
+ var->sharing_penalty_ = 0.0;
+ var->staged_penalty_ = 0.0;
var->value_ = 0.0;
check_concurrency();
}
/* /brief Find variables that can be enabled and enable them.
*
- * Assuming that the variable has already been removed from non-zero weights
+ * Assuming that the variable has already been removed from non-zero penalties
* Can we find a staged variable to add?
* If yes, check that none of the constraints that this variable is involved in is at the limit of its concurrency
* And then add it to enabled variables
if (cnstr->get_concurrency_limit() < 0)
return;
- int numelem = cnstr->disabled_element_set_.size();
- if (not numelem)
+ size_t numelem = cnstr->disabled_element_set_.size();
+ if (numelem == 0)
return;
Element* elem = &cnstr->disabled_element_set_.front();
// Cannot use foreach loop, because System::enable_var() will modify disabled_element_set.. within the loop
while (numelem-- && elem) {
-
Element* nextelem;
if (elem->disabled_element_set_hook.is_linked()) {
auto iter = std::next(cnstr->disabled_element_set_.iterator_to(*elem));
nextelem = nullptr;
}
- if (elem->variable->staged_weight_ > 0 && elem->variable->can_enable()) {
+ if (elem->variable->staged_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?
// Anyway, caller functions all call check_concurrency() in the end.
}
-/* @brief update the weight of a variable, and enable/disable it.
- * @return Returns whether a change was made
- */
-void System::update_variable_weight(Variable* var, double weight)
+/** @brief update the penalty of a variable (disable it by passing 0 as a penalty) */
+void System::update_variable_penalty(Variable* var, double penalty)
{
- xbt_assert(weight >= 0, "Variable weight should not be negative!");
-
- if (weight == var->sharing_weight_)
+ xbt_assert(penalty >= 0, "Variable penalty should not be negative!");
+ if (penalty == var->sharing_penalty_)
return;
- int enabling_var = (weight > 0 && var->sharing_weight_ <= 0);
- int disabling_var = (weight <= 0 && var->sharing_weight_ > 0);
+ bool enabling_var = (penalty > 0 && var->sharing_penalty_ <= 0);
+ bool disabling_var = (penalty <= 0 && var->sharing_penalty_ > 0);
- XBT_IN("(sys=%p, var=%p, weight=%f)", this, var, weight);
+ XBT_IN("(sys=%p, var=%p, var->sharing_penalty = %f, penalty=%f)", this, var, var->sharing_penalty_, penalty);
modified_ = true;
// Are we enabling this variable?
if (enabling_var) {
- var->staged_weight_ = weight;
+ var->staged_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 weight %f and concurrency"
+ XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack %i, with penalty %f and concurrency"
" share %i",
- minslack, weight, var->concurrency_share_);
+ minslack, penalty, var->concurrency_share_);
return;
}
XBT_DEBUG("Enabling var with min concurrency slack %i", minslack);
enable_var(var);
} else if (disabling_var) {
- // Are we disabling this variable?
disable_var(var);
} else {
- var->sharing_weight_ = weight;
+ var->sharing_penalty_ = penalty;
+ if (not var->cnsts_.empty())
+ update_modified_set(var->cnsts_[0].constraint);
}
check_concurrency();
* 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(Constraint* cnst)
+void System::update_modified_set_rec(const Constraint* cnst)
{
for (Element const& elem : cnst->enabled_element_set_) {
Variable* var = elem.variable;
// In effect, the var->visited value will no more be equal to visited counter
// To be clean, when visited counter has wrapped around, we force these var->visited values so that variables that
// were in the modified a long long time ago are not wrongly skipped here, which would lead to very nasty bugs
- // (i.e. not readibily reproducible, and requiring a lot of run time before happening).
+ // (i.e. not readily reproducible, and requiring a lot of run time before happening).
if (++visited_counter_ == 1) {
/* the counter wrapped around, reset each variable->visited */
for (Variable& var : variable_set)
double Constraint::get_usage() const
{
double result = 0.0;
- if (sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE) {
+ if (sharing_policy_ != SharingPolicy::FATPIPE) {
for (Element const& elem : enabled_element_set_)
if (elem.consumption_weight > 0)
result += elem.consumption_weight * elem.variable->value_;
int Constraint::get_variable_amount() const
{
- return std::count_if(std::begin(enabled_element_set_), std::end(enabled_element_set_),
- [](const Element& elem) { return elem.consumption_weight > 0; });
-}
-}
+ 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,
+ "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