-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2018. 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 "xbt/log.h"
#include "xbt/mallocator.h"
#include "xbt/sysdep.h"
+#include "xbt/utility.hpp"
#include <algorithm>
#include <cmath>
#include <cstdlib>
typedef std::vector<int> dyn_light_t;
-int s_lmm_variable_t::Global_debug_id = 1;
-int s_lmm_constraint_t::Global_debug_id = 1;
+int Variable::Global_debug_id = 1;
+int Constraint::Global_debug_id = 1;
-int s_lmm_element_t::get_concurrency() const
+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;
// return (int)ceil(elem->weight);//Include element as the rounded-up integer value of the element weight
}
-void s_lmm_element_t::decrease_concurrency()
+void Element::decrease_concurrency()
{
xbt_assert(constraint->concurrency_current >= get_concurrency());
constraint->concurrency_current -= get_concurrency();
}
-void s_lmm_element_t::increase_concurrency()
+void Element::increase_concurrency()
{
constraint->concurrency_current += get_concurrency();
"Concurrency limit overflow!");
}
-void s_lmm_system_t::check_concurrency() const
+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))
return;
- for (s_lmm_constraint_t const& cnst : constraint_set) {
+ for (Constraint const& cnst : constraint_set) {
int concurrency = 0;
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ for (Element const& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
concurrency += elem.get_concurrency();
}
- for (s_lmm_element_t const& elem : cnst.disabled_element_set) {
+ 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 ||
elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share,
}
// Check that for each variable, all corresponding elements are in the same state (i.e. same element sets)
- for (s_lmm_variable_t const& var : variable_set) {
+ for (Variable const& var : variable_set) {
if (var.cnsts.empty())
continue;
- const s_lmm_element_t& 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();
+ 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();
- for (s_lmm_element_t const& elem2 : var.cnsts) {
+ for (Element const& elem2 : var.cnsts) {
xbt_assert(belong_to_enabled == elem2.enabled_element_set_hook.is_linked(),
"Variable inconsistency (1): enabled_element_set");
xbt_assert(belong_to_disabled == elem2.disabled_element_set_hook.is_linked(),
}
}
-void s_lmm_system_t::var_free(lmm_variable_t var)
+void System::var_free(Variable* var)
{
XBT_IN("(sys=%p, var=%p)", this, var);
- modified = true;
+ modified_ = true;
// 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);
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
if (var->sharing_weight > 0)
elem.decrease_concurrency();
- if (elem.enabled_element_set_hook.is_linked()) {
- auto& set = elem.constraint->enabled_element_set;
- set.erase(set.iterator_to(elem));
- }
- if (elem.disabled_element_set_hook.is_linked()) {
- auto& set = elem.constraint->disabled_element_set;
- set.erase(set.iterator_to(elem));
- }
- if (elem.active_element_set_hook.is_linked()) {
- auto& set = elem.constraint->active_element_set;
- set.erase(set.iterator_to(elem));
- }
+ if (elem.enabled_element_set_hook.is_linked())
+ simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set, elem);
+ if (elem.disabled_element_set_hook.is_linked())
+ 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)
make_constraint_inactive(elem.constraint);
check_concurrency();
- xbt_mallocator_release(variable_mallocator, var);
+ xbt_mallocator_release(variable_mallocator_, var);
XBT_OUT();
}
-s_lmm_system_t::s_lmm_system_t(bool selective_update) : selective_update_active(selective_update)
+System::System(bool selective_update) : selective_update_active(selective_update)
{
- modified = false;
- visited_counter = 1;
-
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
- keep_track = nullptr;
- variable_mallocator = xbt_mallocator_new(65536, s_lmm_system_t::variable_mallocator_new_f,
- s_lmm_system_t::variable_mallocator_free_f, nullptr);
- solve_fun = &lmm_solve;
+ if (selective_update)
+ modified_set_ = new kernel::resource::Action::ModifiedSet();
}
-s_lmm_system_t::~s_lmm_system_t()
+System::~System()
{
- lmm_variable_t var;
- lmm_constraint_t cnst;
+ Variable* var;
+ Constraint* cnst;
while ((var = extract_variable())) {
auto demangled = simgrid::xbt::demangle(typeid(*var->id).name());
while ((cnst = extract_constraint()))
cnst_free(cnst);
- xbt_mallocator_free(variable_mallocator);
+ xbt_mallocator_free(variable_mallocator_);
+ delete modified_set_;
}
-void s_lmm_system_t::cnst_free(lmm_constraint_t cnst)
+void System::cnst_free(Constraint* cnst)
{
make_constraint_inactive(cnst);
delete cnst;
}
-s_lmm_constraint_t::s_lmm_constraint_t(void* id_value, double bound_value) : bound(bound_value), id(id_value)
+Constraint::Constraint(void* id_value, double bound_value) : bound(bound_value), id(id_value)
{
id_int = Global_debug_id++;
cnst_light = nullptr;
}
-lmm_constraint_t s_lmm_system_t::constraint_new(void* id, double bound_value)
+Constraint* System::constraint_new(void* id, double bound_value)
{
- lmm_constraint_t cnst = new s_lmm_constraint_t(id, bound_value);
+ Constraint* cnst = new Constraint(id, bound_value);
insert_constraint(cnst);
return cnst;
}
-void* s_lmm_system_t::variable_mallocator_new_f()
+void* System::variable_mallocator_new_f()
{
- return new s_lmm_variable_t;
+ return new Variable;
}
-void s_lmm_system_t::variable_mallocator_free_f(void* var)
+void System::variable_mallocator_free_f(void* var)
{
- delete static_cast<lmm_variable_t>(var);
+ delete static_cast<Variable*>(var);
}
-lmm_variable_t s_lmm_system_t::variable_new(simgrid::surf::Action* id, double sharing_weight, double bound,
- int number_of_constraints)
+Variable* System::variable_new(simgrid::kernel::resource::Action* id, double sharing_weight, double bound,
+ int number_of_constraints)
{
XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", this, id, sharing_weight, bound, number_of_constraints);
- lmm_variable_t var = static_cast<lmm_variable_t>(xbt_mallocator_get(variable_mallocator));
- var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter - 1);
+ 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)
variable_set.push_front(*var);
else
return var;
}
-void s_lmm_system_t::variable_free(lmm_variable_t var)
+void System::variable_free(Variable* var)
{
remove_variable(var);
var_free(var);
}
-void s_lmm_system_t::expand(lmm_constraint_t cnst, lmm_variable_t var, double consumption_weight)
+void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
{
- modified = true;
+ modified_ = true;
// Check if this variable already has an active element in this constraint
// If it does, substract it from the required slack
int current_share = 0;
if (var->concurrency_share > 1) {
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
if (elem.constraint == cnst && elem.enabled_element_set_hook.is_linked())
current_share += elem.get_concurrency();
}
if (var->sharing_weight > 0 && var->concurrency_share - current_share > cnst->get_concurrency_slack()) {
double weight = var->sharing_weight;
disable_var(var);
- for (s_lmm_element_t const& elem : var->cnsts)
+ for (Element const& elem : var->cnsts)
on_disabled_var(elem.constraint);
consumption_weight = 0;
var->staged_weight = weight;
xbt_assert(var->cnsts.size() < var->cnsts.capacity(), "Too much constraints");
var->cnsts.resize(var->cnsts.size() + 1);
- s_lmm_element_t& elem = var->cnsts.back();
+ Element& elem = var->cnsts.back();
elem.consumption_weight = consumption_weight;
elem.constraint = cnst;
check_concurrency();
}
-void s_lmm_system_t::expand_add(lmm_constraint_t cnst, lmm_variable_t var, double value)
+void System::expand_add(Constraint* cnst, Variable* var, double value)
{
- modified = true;
+ 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](s_lmm_element_t const& x) { return x.constraint == cnst; });
+ 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)) {
- s_lmm_element_t& elem = *elem_it;
+ Element& elem = *elem_it;
if (var->sharing_weight)
elem.decrease_concurrency();
if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
double weight = var->sharing_weight;
disable_var(var);
- for (s_lmm_element_t const& elem2 : var->cnsts)
+ for (Element const& elem2 : var->cnsts)
on_disabled_var(elem2.constraint);
var->staged_weight = weight;
xbt_assert(not var->sharing_weight);
check_concurrency();
}
-lmm_variable_t s_lmm_constraint_t::get_variable(const_lmm_element_t* elem) const
+Variable* Constraint::get_variable(const_lmm_element_t* elem) const
{
if (*elem == nullptr) {
// That is the first call, pick the first element among enabled_element_set (or disabled_element_set if
// if we modify the list between calls, normal version may loop forever
// this safe version ensures that we browse the list elements only once
-lmm_variable_t s_lmm_constraint_t::get_variable_safe(const_lmm_element_t* elem, const_lmm_element_t* nextelem,
- int* numelem) const
+Variable* Constraint::get_variable_safe(const_lmm_element_t* elem, const_lmm_element_t* nextelem, int* numelem) const
{
if (*elem == nullptr) {
*numelem = enabled_element_set.size() + disabled_element_set.size() - 1;
// Look at enabled_element_set, and jump to disabled_element_set when finished
auto iter = std::next(enabled_element_set.iterator_to(**elem));
if (iter != std::end(enabled_element_set))
- *elem = &*iter;
+ *nextelem = &*iter;
else if (not disabled_element_set.empty())
- *elem = &disabled_element_set.front();
+ *nextelem = &disabled_element_set.front();
else
- *elem = nullptr;
+ *nextelem = nullptr;
} else {
auto iter = std::next(disabled_element_set.iterator_to(**elem));
- *elem = iter != std::end(disabled_element_set) ? &*iter : nullptr;
+ *nextelem = iter != std::end(disabled_element_set) ? &*iter : nullptr;
}
return (*elem)->variable;
} else
}
}
-static inline void saturated_variable_set_update(s_lmm_constraint_light_t* cnst_light_tab,
- const dyn_light_t& saturated_constraints, lmm_system_t sys)
+static inline void saturated_variable_set_update(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) {
- s_lmm_constraint_light_t& cnst = cnst_light_tab[saturated_cnst];
- for (s_lmm_element_t const& elem : cnst.cnst->active_element_set) {
+ 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);
if (elem.consumption_weight > 0 && not elem.variable->saturated_variable_set_hook.is_linked())
}
template <class ElemList>
-static void format_lmm_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
+static void format_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
{
- for (s_lmm_element_t const& elem : elem_list) {
+ for (Element const& elem : elem_list) {
buf += std::to_string(elem.consumption_weight) + ".'" + std::to_string(elem.variable->id_int) + "'(" +
std::to_string(elem.variable->value) + ")" + (sharing_policy ? " + " : " , ");
if (sharing_policy)
}
}
-void s_lmm_system_t::print() const
+void System::print() const
{
std::string buf = std::string("MAX-MIN ( ");
/* Printing Objective */
- for (s_lmm_variable_t const& var : variable_set)
+ for (Variable const& var : variable_set)
buf += "'" + std::to_string(var.id_int) + "'(" + std::to_string(var.sharing_weight) + ") ";
buf += ")";
XBT_DEBUG("%20s", buf.c_str());
XBT_DEBUG("Constraints");
/* Printing Constraints */
- for (s_lmm_constraint_t const& cnst : active_constraint_set) {
+ for (Constraint const& cnst : active_constraint_set) {
double sum = 0.0;
// Show the enabled variables
buf += "\t";
buf += cnst.sharing_policy ? "(" : "max(";
- format_lmm_element_list(cnst.enabled_element_set, cnst.sharing_policy, sum, buf);
+ 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_lmm_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
+ format_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
buf += "0) <= " + std::to_string(cnst.bound) + " ('" + std::to_string(cnst.id_int) + "')";
XBT_DEBUG("Variables");
/* Printing Result */
- for (s_lmm_variable_t const& var : variable_set) {
+ for (Variable const& var : variable_set) {
if (var.bound > 0) {
XBT_DEBUG("'%d'(%f) : %f (<=%f)", var.id_int, var.sharing_weight, var.value, var.bound);
xbt_assert(not double_positive(var.value - var.bound, var.bound * sg_maxmin_precision),
}
}
-void s_lmm_system_t::solve()
+void System::lmm_solve()
{
- if (modified) {
+ 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)
- solve(modified_constraint_set);
+ lmm_solve(modified_constraint_set);
else
- solve(active_constraint_set);
+ lmm_solve(active_constraint_set);
XBT_OUT();
}
}
-template <class CnstList> void s_lmm_system_t::solve(CnstList& cnst_list)
+template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
{
double min_usage = -1;
double min_bound = -1;
XBT_DEBUG("Active constraints : %zu", cnst_list.size());
/* Init: Only modified code portions: reset the value of active variables */
- for (s_lmm_constraint_t const& cnst : cnst_list) {
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ 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;
}
}
- s_lmm_constraint_light_t* cnst_light_tab = new s_lmm_constraint_light_t[cnst_list.size()]();
- int cnst_light_num = 0;
+ ConstraintLight* cnst_light_tab = new ConstraintLight[cnst_list.size()]();
+ int cnst_light_num = 0;
dyn_light_t saturated_constraints;
- for (s_lmm_constraint_t& cnst : cnst_list) {
+ 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))
continue;
cnst.usage = 0;
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
if (elem.consumption_weight > 0) {
if (cnst.sharing_policy)
cnst.usage = elem.consumption_weight / elem.variable->sharing_weight;
elem.make_active();
- simgrid::surf::Action* action = static_cast<simgrid::surf::Action*>(elem.variable->id);
- if (keep_track && not action->is_linked())
- keep_track->push_back(*action);
+ simgrid::kernel::resource::Action* action = static_cast<simgrid::kernel::resource::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.id_int, cnst.usage,
do {
/* Fix the variables that have to be */
auto& var_list = saturated_variable_set;
- for (s_lmm_variable_t const& var : var_list) {
+ for (Variable const& var : var_list) {
if (var.sharing_weight <= 0.0)
DIE_IMPOSSIBLE;
/* First check if some of these variables could reach their upper bound and update min_bound accordingly. */
}
while (not var_list.empty()) {
- s_lmm_variable_t& var = var_list.front();
+ 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.id_int, var.value);
/* Update the usage of contraints where this variable is involved */
- for (s_lmm_element_t& elem : var.cnsts) {
- lmm_constraint_t cnst = elem.constraint;
+ for (Element& elem : var.cnsts) {
+ Constraint* cnst = elem.constraint;
if (cnst->sharing_policy) {
// 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);
// Remember: non-shared constraints only require that max(elem.value * var.value) < cnst->bound
cnst->usage = 0.0;
elem.make_inactive();
- for (s_lmm_element_t& elem2 : cnst->enabled_element_set) {
+ for (Element& elem2 : cnst->enabled_element_set) {
xbt_assert(elem2.variable->sharing_weight > 0);
if (elem2.variable->value > 0)
continue;
} while (cnst_light_num > 0);
- modified = false;
+ modified_ = false;
if (selective_update_active)
remove_all_modified_set();
delete[] cnst_light_tab;
}
-void lmm_solve(lmm_system_t sys)
-{
- sys->solve();
-}
-
/** \brief Attribute the value bound to var->bound.
*
- * \param sys the lmm_system_t
- * \param var the lmm_variable_t
+ * \param var the Variable*
* \param bound the new bound to associate with var
*
* Makes var->bound equal to bound. Whenever this function is called a change is signed in the system. To
* avoid false system changing detection it is a good idea to test (bound != 0) before calling it.
*/
-void s_lmm_system_t::update_variable_bound(lmm_variable_t var, double bound)
+void System::update_variable_bound(Variable* var, double bound)
{
- modified = true;
+ modified_ = true;
var->bound = bound;
if (not var->cnsts.empty())
update_modified_set(var->cnsts[0].constraint);
}
-void s_lmm_variable_t::initialize(simgrid::surf::Action* id_value, double sharing_weight_value, double bound_value,
- int number_of_constraints, unsigned visited_value)
+void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value,
+ int number_of_constraints, unsigned visited_value)
{
id = id_value;
id_int = Global_debug_id++;
visited = visited_value;
mu = 0.0;
new_mu = 0.0;
- func_f = func_f_def;
- func_fp = func_fp_def;
- func_fpi = func_fpi_def;
xbt_assert(not variable_set_hook.is_linked());
xbt_assert(not saturated_variable_set_hook.is_linked());
}
-int s_lmm_variable_t::get_min_concurrency_slack() const
+int Variable::get_min_concurrency_slack() const
{
int minslack = std::numeric_limits<int>::max();
- for (s_lmm_element_t const& elem : cnsts) {
+ for (Element const& elem : cnsts) {
int slack = elem.constraint->get_concurrency_slack();
if (slack < minslack) {
// This is only an optimization, to avoid looking at more constraints when slack is already zero
return minslack;
}
-// Small remark: In this implementation of lmm_enable_var and lmm_disable_var, we will meet multiple times with var when
-// running sys->update_modified_set.
-// A priori not a big performance issue, but we might do better by calling sys->update_modified_set within the for loops
-// (after doing the first for enabling==1, and before doing the last for disabling==1)
-void s_lmm_system_t::enable_var(lmm_variable_t var)
+// 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)
+void System::enable_var(Variable* var)
{
xbt_assert(not XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug) || var->can_enable());
// 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.
- variable_set.erase(variable_set.iterator_to(*var));
+ simgrid::xbt::intrusive_erase(variable_set, *var);
variable_set.push_front(*var);
- for (s_lmm_element_t& elem : var->cnsts) {
- auto& set = elem.constraint->disabled_element_set;
- set.erase(set.iterator_to(elem));
+ for (Element& elem : var->cnsts) {
+ simgrid::xbt::intrusive_erase(elem.constraint->disabled_element_set, elem);
elem.constraint->enabled_element_set.push_front(elem);
elem.increase_concurrency();
}
// Anyway, caller functions all call check_concurrency() in the end.
}
-void s_lmm_system_t::disable_var(lmm_variable_t var)
+void System::disable_var(Variable* var)
{
xbt_assert(not var->staged_weight, "Staged weight 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.
- variable_set.erase(variable_set.iterator_to(*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);
- for (s_lmm_element_t& elem : var->cnsts) {
- auto& set = elem.constraint->enabled_element_set;
- set.erase(set.iterator_to(elem));
+ for (Element& elem : var->cnsts) {
+ simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set, elem);
elem.constraint->disabled_element_set.push_back(elem);
- if (elem.active_element_set_hook.is_linked()) {
- auto& set = elem.constraint->active_element_set;
- set.erase(set.iterator_to(elem));
- }
+ if (elem.active_element_set_hook.is_linked())
+ simgrid::xbt::intrusive_erase(elem.constraint->active_element_set, elem);
elem.decrease_concurrency();
}
* 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
*/
-void s_lmm_system_t::on_disabled_var(lmm_constraint_t cnstr)
+void System::on_disabled_var(Constraint* cnstr)
{
if (cnstr->get_concurrency_limit() < 0)
return;
if (not numelem)
return;
- lmm_element_t elem = &cnstr->disabled_element_set.front();
+ Element* elem = &cnstr->disabled_element_set.front();
- // Cannot use foreach loop, because lmm_enable_var will modify disabled_element_set.. within the loop
+ // Cannot use foreach loop, because System::enable_var() will modify disabled_element_set.. within the loop
while (numelem-- && elem) {
- lmm_element_t nextelem;
+ Element* nextelem;
if (elem->disabled_element_set_hook.is_linked()) {
auto iter = std::next(cnstr->disabled_element_set.iterator_to(*elem));
nextelem = iter != std::end(cnstr->disabled_element_set) ? &*iter : nullptr;
/* \brief update the weight of a variable, and enable/disable it.
* @return Returns whether a change was made
*/
-void s_lmm_system_t::update_variable_weight(lmm_variable_t var, double weight)
+void System::update_variable_weight(Variable* var, double weight)
{
xbt_assert(weight >= 0, "Variable weight should not be negative!");
XBT_IN("(sys=%p, var=%p, weight=%f)", this, var, weight);
- modified = true;
+ modified_ = true;
// Are we enabling this variable?
if (enabling_var) {
XBT_OUT();
}
-void s_lmm_system_t::update_constraint_bound(lmm_constraint_t cnst, double bound)
+void System::update_constraint_bound(Constraint* cnst, double bound)
{
- modified = true;
+ modified_ = true;
update_modified_set(cnst);
cnst->bound = bound;
}
/** \brief Update the constraint set propagating recursively to other constraints so the system should not be entirely
* computed.
*
- * \param sys the lmm_system_t
- * \param cnst the lmm_constraint_t affected by the change
+ * \param cnst the Constraint* affected by the change
*
* 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 s_lmm_system_t::update_modified_set_rec(lmm_constraint_t cnst)
+void System::update_modified_set_rec(Constraint* cnst)
{
- for (s_lmm_element_t const& elem : cnst->enabled_element_set) {
- lmm_variable_t var = elem.variable;
- for (s_lmm_element_t const& elem2 : var->cnsts) {
- if (var->visited == visited_counter)
+ for (Element const& elem : cnst->enabled_element_set) {
+ Variable* var = elem.variable;
+ for (Element const& elem2 : var->cnsts) {
+ if (var->visited == visited_counter_)
break;
if (elem2.constraint != cnst && not elem2.constraint->modified_constraint_set_hook.is_linked()) {
modified_constraint_set.push_back(*elem2.constraint);
}
}
// var will be ignored in later visits as long as sys->visited_counter does not move
- var->visited = visited_counter;
+ var->visited = visited_counter_;
}
}
-void s_lmm_system_t::update_modified_set(lmm_constraint_t cnst)
+void System::update_modified_set(Constraint* cnst)
{
/* nothing to do if selective update isn't active */
if (selective_update_active && not cnst->modified_constraint_set_hook.is_linked()) {
}
}
-void s_lmm_system_t::remove_all_modified_set()
+void System::remove_all_modified_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
// 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).
- if (++visited_counter == 1) {
+ if (++visited_counter_ == 1) {
/* the counter wrapped around, reset each variable->visited */
- for (s_lmm_variable_t& var : variable_set)
+ for (Variable& var : variable_set)
var.visited = 0;
}
modified_constraint_set.clear();
*
* If the resource is not shared (ie in FATPIPE mode), then the load is the max (not the sum) of all resource usages
* located on this resource.
- *
- * \param cnst the lmm_constraint_t associated to the resource
*/
-double s_lmm_constraint_t::get_usage() const
+double Constraint::get_usage() const
{
double result = 0.0;
if (sharing_policy) {
- for (s_lmm_element_t const& elem : enabled_element_set)
+ for (Element const& elem : enabled_element_set)
if (elem.consumption_weight > 0)
result += elem.consumption_weight * elem.variable->value;
} else {
- for (s_lmm_element_t const& elem : enabled_element_set)
+ for (Element const& elem : enabled_element_set)
if (elem.consumption_weight > 0)
result = std::max(result, elem.consumption_weight * elem.variable->value);
}
return result;
}
-int s_lmm_constraint_t::get_variable_amount() const
+int Constraint::get_variable_amount() const
{
return std::count_if(std::begin(enabled_element_set), std::end(enabled_element_set),
- [](const s_lmm_element_t& elem) { return elem.consumption_weight > 0; });
+ [](const Element& elem) { return elem.consumption_weight > 0; });
}
}
}
