#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
+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;
- void* cnstIt;
- xbt_swag_foreach(cnstIt, &constraint_set)
- {
- lmm_constraint_t cnst = (lmm_constraint_t)cnstIt;
+ for (Constraint const& cnst : constraint_set) {
int concurrency = 0;
- void* elemIt;
- xbt_swag_foreach(elemIt, &(cnst->enabled_element_set))
- {
- lmm_element_t elem = (lmm_element_t)elemIt;
- xbt_assert(elem->variable->sharing_weight > 0);
- concurrency += elem->get_concurrency();
+ for (Element const& elem : cnst.enabled_element_set) {
+ xbt_assert(elem.variable->sharing_weight > 0);
+ concurrency += elem.get_concurrency();
}
- xbt_swag_foreach(elemIt, &(cnst->disabled_element_set))
- {
- lmm_element_t elem = (lmm_element_t)elemIt;
+ 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,
+ xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_weight == 0 ||
+ elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share,
"should not have staged variable!");
}
- xbt_assert(cnst->get_concurrency_limit() < 0 || cnst->get_concurrency_limit() >= concurrency,
+ xbt_assert(cnst.get_concurrency_limit() < 0 || cnst.get_concurrency_limit() >= concurrency,
"concurrency check failed!");
- xbt_assert(cnst->concurrency_current == concurrency, "concurrency_current is out-of-date!");
+ xbt_assert(cnst.concurrency_current == concurrency, "concurrency_current is out-of-date!");
}
// Check that for each variable, all corresponding elements are in the same state (i.e. same element sets)
- void* varIt;
- xbt_swag_foreach(varIt, &variable_set)
- {
- lmm_variable_t var = (lmm_variable_t)varIt;
-
- if (var->cnsts.empty())
+ for (Variable const& var : variable_set) {
+ if (var.cnsts.empty())
continue;
- lmm_element_t elem = &var->cnsts[0];
- int belong_to_enabled = xbt_swag_belongs(elem, &(elem->constraint->enabled_element_set));
- int belong_to_disabled = xbt_swag_belongs(elem, &(elem->constraint->disabled_element_set));
- int belong_to_active = xbt_swag_belongs(elem, &(elem->constraint->active_element_set));
+ 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& elem : var->cnsts) {
- xbt_assert(belong_to_enabled == xbt_swag_belongs(&elem, &(elem.constraint->enabled_element_set)),
+ 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 == xbt_swag_belongs(&elem, &(elem.constraint->disabled_element_set)),
+ xbt_assert(belong_to_disabled == elem2.disabled_element_set_hook.is_linked(),
"Variable inconsistency (2): disabled_element_set");
- xbt_assert(belong_to_active == xbt_swag_belongs(&elem, &(elem.constraint->active_element_set)),
+ xbt_assert(belong_to_active == elem2.active_element_set_hook.is_linked(),
"Variable inconsistency (3): active_element_set");
}
}
}
-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;
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();
- xbt_swag_remove(&elem, &(elem.constraint->enabled_element_set));
- xbt_swag_remove(&elem, &(elem.constraint->disabled_element_set));
- xbt_swag_remove(&elem, &(elem.constraint->active_element_set));
- int nelements = xbt_swag_size(&(elem.constraint->enabled_element_set)) +
- xbt_swag_size(&(elem.constraint->disabled_element_set));
+ 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);
else
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)
{
- s_lmm_variable_t var;
- s_lmm_constraint_t cnst;
-
modified = false;
visited_counter = 1;
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
- xbt_swag_init(&variable_set, xbt_swag_offset(var, variable_set_hookup));
- xbt_swag_init(&constraint_set, xbt_swag_offset(cnst, constraint_set_hookup));
-
- xbt_swag_init(&active_constraint_set, xbt_swag_offset(cnst, active_constraint_set_hookup));
-
- xbt_swag_init(&modified_constraint_set, xbt_swag_offset(cnst, modified_constraint_set_hookup));
- xbt_swag_init(&saturated_variable_set, xbt_swag_offset(var, saturated_variable_set_hookup));
- xbt_swag_init(&saturated_constraint_set, xbt_swag_offset(cnst, saturated_constraint_set_hookup));
-
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);
+ variable_mallocator =
+ xbt_mallocator_new(65536, System::variable_mallocator_new_f, System::variable_mallocator_free_f, nullptr);
solve_fun = &lmm_solve;
}
-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());
xbt_mallocator_free(variable_mallocator);
}
-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)
{
- s_lmm_element_t elem;
-
id_int = Global_debug_id++;
- xbt_swag_init(&enabled_element_set, xbt_swag_offset(elem, enabled_element_set_hookup));
- xbt_swag_init(&disabled_element_set, xbt_swag_offset(elem, disabled_element_set_hookup));
- xbt_swag_init(&active_element_set, xbt_swag_offset(elem, active_element_set_hookup));
remaining = 0.0;
usage = 0.0;
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::surf::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));
+ 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)
- xbt_swag_insert_at_head(var, &variable_set);
+ variable_set.push_front(*var);
else
- xbt_swag_insert_at_tail(var, &variable_set);
+ variable_set.push_back(*var);
XBT_OUT(" returns %p", var);
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;
// 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) {
- if (elem.constraint == cnst && xbt_swag_belongs(&elem, &(elem.constraint->enabled_element_set)))
+ 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;
elem.variable = var;
if (var->sharing_weight) {
- xbt_swag_insert_at_head(&elem, &(elem.constraint->enabled_element_set));
+ elem.constraint->enabled_element_set.push_front(elem);
elem.increase_concurrency();
} else
- xbt_swag_insert_at_tail(&elem, &(elem.constraint->disabled_element_set));
+ elem.constraint->disabled_element_set.push_back(elem);
if (not selective_update_active) {
make_constraint_active(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;
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
// enabled_element_set is empty)
- *elem = (lmm_element_t)xbt_swag_getFirst(&enabled_element_set);
- if (*elem == nullptr)
- *elem = (lmm_element_t)xbt_swag_getFirst(&disabled_element_set);
+ if (not enabled_element_set.empty())
+ *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 (xbt_swag_belongs(*elem, &enabled_element_set)) {
+ if ((*elem)->enabled_element_set_hook.is_linked()) {
// Look at enabled_element_set, and jump to disabled_element_set when finished
- *elem = (lmm_element_t)xbt_swag_getNext(*elem, enabled_element_set.offset);
- if (*elem == nullptr)
- *elem = (lmm_element_t)xbt_swag_getFirst(&disabled_element_set);
+ auto iter = std::next(enabled_element_set.iterator_to(**elem));
+ if (iter != std::end(enabled_element_set))
+ *elem = &*iter;
+ else if (not disabled_element_set.empty())
+ *elem = &disabled_element_set.front();
+ else
+ *elem = nullptr;
} else {
- *elem = (lmm_element_t)xbt_swag_getNext(*elem, disabled_element_set.offset);
+ auto iter = std::next(disabled_element_set.iterator_to(**elem));
+ *elem = iter != std::end(disabled_element_set) ? &*iter : nullptr;
}
}
if (*elem)
return nullptr;
}
-// if we modify the swag between calls, normal version may loop forever
-// this safe version ensures that we browse the swag 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
+// 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_lmm_element_t* elem, const_lmm_element_t* nextelem, int* numelem) const
{
if (*elem == nullptr) {
- *elem = (lmm_element_t)xbt_swag_getFirst(&enabled_element_set);
- *numelem = xbt_swag_size(&enabled_element_set) + xbt_swag_size(&disabled_element_set) - 1;
- if (*elem == nullptr)
- *elem = (lmm_element_t)xbt_swag_getFirst(&disabled_element_set);
+ *numelem = enabled_element_set.size() + disabled_element_set.size() - 1;
+ if (not enabled_element_set.empty())
+ *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) {
}
if (*elem) {
// elem is not null, so we carry on
- if (xbt_swag_belongs(*elem, &enabled_element_set)) {
+ if ((*elem)->enabled_element_set_hook.is_linked()) {
// Look at enabled_element_set, and jump to disabled_element_set when finished
- *nextelem = (lmm_element_t)xbt_swag_getNext(*elem, enabled_element_set.offset);
- if (*nextelem == nullptr)
- *nextelem = (lmm_element_t)xbt_swag_getFirst(&disabled_element_set);
+ auto iter = std::next(enabled_element_set.iterator_to(**elem));
+ if (iter != std::end(enabled_element_set))
+ *nextelem = &*iter;
+ else if (not disabled_element_set.empty())
+ *nextelem = &disabled_element_set.front();
+ else
+ *nextelem = nullptr;
} else {
- *nextelem = (lmm_element_t)xbt_swag_getNext(*elem, disabled_element_set.offset);
+ auto iter = std::next(disabled_element_set.iterator_to(**elem));
+ *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,
+static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab,
const dyn_light_t& saturated_constraints, lmm_system_t 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) {
- lmm_constraint_light_t cnst = &cnst_light_tab[saturated_cnst];
- void* _elem;
- xbt_swag_t elem_list = &(cnst->cnst->active_element_set);
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem = (lmm_element_t)_elem;
+ 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)
- xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ xbt_assert(elem.variable->sharing_weight > 0);
+ if (elem.consumption_weight > 0 && not elem.variable->saturated_variable_set_hook.is_linked())
+ sys->saturated_variable_set.push_back(*elem.variable);
}
}
}
-static void format_lmm_element_swag(const_xbt_swag_t elem_list, int sharing_policy, double& sum, std::string& buf)
+template <class ElemList>
+static void format_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
{
- void* _elem;
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem = (lmm_element_t)_elem;
- buf += std::to_string(elem->consumption_weight) + ".'" + std::to_string(elem->variable->id_int) + "'(" +
- std::to_string(elem->variable->value) + ")" + (sharing_policy ? " + " : " , ");
+ 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)
- sum += elem->consumption_weight * elem->variable->value;
+ sum += elem.consumption_weight * elem.variable->value;
else
- sum = std::max(sum, elem->consumption_weight * elem->variable->value);
+ sum = std::max(sum, elem.consumption_weight * elem.variable->value);
}
}
-void s_lmm_system_t::print() const
+void System::print() const
{
std::string buf = std::string("MAX-MIN ( ");
- void* _var;
/* Printing Objective */
- const_xbt_swag_t var_list = &variable_set;
- xbt_swag_foreach(_var, var_list)
- {
- lmm_variable_t var = (lmm_variable_t)_var;
- buf = buf + "'" + std::to_string(var->id_int) + "'(" + std::to_string(var->sharing_weight) + ") ";
- }
+ 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());
buf.clear();
XBT_DEBUG("Constraints");
/* Printing Constraints */
- void* _cnst;
- const_xbt_swag_t cnst_list = &active_constraint_set;
- xbt_swag_foreach(_cnst, cnst_list)
- {
- lmm_constraint_t cnst = (lmm_constraint_t)_cnst;
+ 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_swag(&cnst->enabled_element_set, cnst->sharing_policy, sum, buf);
+ buf += cnst.sharing_policy ? "(" : "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_lmm_element_swag(&cnst->disabled_element_set, cnst->sharing_policy, sum, buf);
+ format_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
- buf = buf + "0) <= " + std::to_string(cnst->bound) + " ('" + std::to_string(cnst->id_int) + "')";
+ buf += "0) <= " + std::to_string(cnst.bound) + " ('" + std::to_string(cnst.id_int) + "')";
- if (not cnst->sharing_policy) {
+ if (not cnst.sharing_policy) {
buf += " [MAX-Constraint]";
}
XBT_DEBUG("%s", buf.c_str());
buf.clear();
- xbt_assert(not double_positive(sum - cnst->bound, cnst->bound * sg_maxmin_precision),
- "Incorrect value (%f is not smaller than %f): %g", sum, cnst->bound, sum - cnst->bound);
+ xbt_assert(not double_positive(sum - cnst.bound, cnst.bound * sg_maxmin_precision),
+ "Incorrect value (%f is not smaller than %f): %g", sum, cnst.bound, sum - cnst.bound);
}
XBT_DEBUG("Variables");
/* Printing Result */
- xbt_swag_foreach(_var, var_list)
- {
- lmm_variable_t var = (lmm_variable_t)_var;
- 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),
- "Incorrect value (%f is not smaller than %f", var->value, var->bound);
+ 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),
+ "Incorrect value (%f is not smaller than %f", var.value, var.bound);
} else {
- XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->sharing_weight, var->value);
+ XBT_DEBUG("'%d'(%f) : %f", var.id_int, var.sharing_weight, var.value);
}
}
}
-void s_lmm_system_t::solve()
+void System::solve()
+{
+ 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);
+ else
+ solve(active_constraint_set);
+ XBT_OUT();
+ }
+}
+
+template <class CnstList> void System::solve(CnstList& cnst_list)
{
- void* _cnst;
- void* _cnst_next;
- void* _elem;
double min_usage = -1;
double min_bound = -1;
- if (not modified)
- return;
-
- 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.
- */
- xbt_swag_t cnst_list = selective_update_active ? &modified_constraint_set : &active_constraint_set;
-
- XBT_DEBUG("Active constraints : %d", xbt_swag_size(cnst_list));
+ XBT_DEBUG("Active constraints : %zu", cnst_list.size());
/* Init: Only modified code portions: reset the value of active variables */
- xbt_swag_foreach(_cnst, cnst_list)
- {
- lmm_constraint_t cnst = (lmm_constraint_t)_cnst;
- xbt_swag_t elem_list = &(cnst->enabled_element_set);
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_variable_t var = ((lmm_element_t)_elem)->variable;
- xbt_assert(var->sharing_weight > 0.0);
- var->value = 0.0;
+ 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[xbt_swag_size(cnst_list)]();
- int cnst_light_num = 0;
+ ConstraintLight* cnst_light_tab = new ConstraintLight[cnst_list.size()]();
+ int cnst_light_num = 0;
dyn_light_t saturated_constraints;
- xbt_swag_foreach_safe(_cnst, _cnst_next, cnst_list)
- {
- lmm_constraint_t cnst = (lmm_constraint_t)_cnst;
+ 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.remaining = cnst.bound;
+ if (not double_positive(cnst.remaining, cnst.bound * sg_maxmin_precision))
continue;
- cnst->usage = 0;
- xbt_swag_t elem_list = &(cnst->enabled_element_set);
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem = (lmm_element_t)_elem;
- 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;
- else if (cnst->usage < elem->consumption_weight / elem->variable->sharing_weight)
- 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())
+ cnst.usage = 0;
+ 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;
+ else if (cnst.usage < elem.consumption_weight / elem.variable->sharing_weight)
+ 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->isLinkedModifiedSet())
keep_track->push_back(*action);
}
}
- XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst->id_int, cnst->usage,
- cnst->remaining, cnst->concurrency_current, cnst->concurrency_maximum, cnst->get_concurrency_limit());
+ XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst.id_int, 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;
+ 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(cnst->active_element_set.count > 0,
+ xbt_assert(not cnst.active_element_set.empty(),
"There is no sense adding a constraint that has no active element!");
cnst_light_num++;
}
/* Saturated variables update */
do {
/* Fix the variables that have to be */
- xbt_swag_t var_list = &saturated_variable_set;
- void* _var;
- lmm_variable_t var = nullptr;
- xbt_swag_foreach(_var, var_list)
- {
- var = (lmm_variable_t)_var;
- if (var->sharing_weight <= 0.0)
+ auto& var_list = saturated_variable_set;
+ 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. */
- XBT_DEBUG("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f", var->id_int,
- 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.weight=%f, min_usage=%f, var.bound*var.weight=%f", var.id_int, var.bound,
+ var.sharing_weight, min_usage, var.bound * var.sharing_weight);
+ if ((var.bound > 0) && (var.bound * var.sharing_weight < min_usage)) {
if (min_bound < 0)
- min_bound = var->bound * var->sharing_weight;
+ min_bound = var.bound * var.sharing_weight;
else
- min_bound = std::min(min_bound, (var->bound * var->sharing_weight));
+ min_bound = std::min(min_bound, (var.bound * var.sharing_weight));
XBT_DEBUG("Updated min_bound=%f", min_bound);
}
}
- while ((var = (lmm_variable_t)xbt_swag_getFirst(var_list))) {
+ 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_weight;
- XBT_DEBUG("Setting var (%d) value to %f\n", var->id_int, var->value);
+ var.value = min_usage / var.sharing_weight;
+ XBT_DEBUG("Setting var (%d) value to %f\n", var.id_int, 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)) {
- var->value = var->bound;
- XBT_DEBUG("Setting %p (%d) value to %f\n", var, var->id_int, var->value);
+ if (double_equals(min_bound, var.bound * var.sharing_weight, sg_maxmin_precision)) {
+ var.value = var.bound;
+ XBT_DEBUG("Setting %p (%d) value to %f\n", &var, var.id_int, 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->id_int);
- xbt_swag_remove(var, var_list);
+ XBT_DEBUG("Do not consider %p (%d) \n", &var, var.id_int);
+ var_list.pop_front();
continue;
}
}
- XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ", min_usage, var->id_int, var->sharing_weight,
- var->id_int, var->value);
+ XBT_DEBUG("Min usage: %f, Var(%d).weight: %f, Var(%d).value: %f ", min_usage, var.id_int, var.sharing_weight,
+ 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);
- double_update(&(cnst->usage), elem.consumption_weight / var->sharing_weight, sg_maxmin_precision);
+ // 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);
// 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)) {
}
elem.make_inactive();
} else {
- // Remember: non-shared constraints only require that max(elem.value * var->value) < cnst->bound
+ // Remember: non-shared constraints only require that max(elem.value * var.value) < cnst->bound
cnst->usage = 0.0;
elem.make_inactive();
- xbt_swag_t elem_list = &(cnst->enabled_element_set);
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem2 = static_cast<lmm_element_t>(_elem);
- xbt_assert(elem2->variable->sharing_weight > 0);
- if (elem2->variable->value > 0)
+ for (Element& elem2 : cnst->enabled_element_set) {
+ xbt_assert(elem2.variable->sharing_weight > 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);
+ if (elem2.consumption_weight > 0)
+ cnst->usage = std::max(cnst->usage, elem2.consumption_weight / elem2.variable->sharing_weight);
}
// If the constraint is saturated, remove it from the set of active constraints (light_tab)
if (not double_positive(cnst->usage, sg_maxmin_precision) ||
}
} else {
cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage;
- xbt_assert(cnst->active_element_set.count > 0,
+ 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.");
}
}
}
- xbt_swag_remove(var, var_list);
+ var_list.pop_front();
}
/* Find out which variables reach the maximum */
saturated_constraints.clear();
int pos;
for (pos = 0; pos < cnst_light_num; pos++) {
- xbt_assert(cnst_light_tab[pos].cnst->active_element_set.count > 0,
+ 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 "
check_concurrency();
delete[] cnst_light_tab;
- XBT_OUT();
}
void lmm_solve(lmm_system_t sys)
/** \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;
var->bound = bound;
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::surf::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++;
func_fp = func_fp_def;
func_fpi = func_fpi_def;
- variable_set_hookup.next = nullptr;
- variable_set_hookup.prev = nullptr;
- saturated_variable_set_hookup.next = nullptr;
- saturated_variable_set_hookup.prev = nullptr;
+ 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());
var->sharing_weight = var->staged_weight;
var->staged_weight = 0;
- // Enabling the variable, move to 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_set AFTER
// moving at least one element of var.
- xbt_swag_remove(var, &variable_set);
- xbt_swag_insert_at_head(var, &variable_set);
- for (s_lmm_element_t& elem : var->cnsts) {
- xbt_swag_remove(&elem, &(elem.constraint->disabled_element_set));
- xbt_swag_insert_at_head(&elem, &(elem.constraint->enabled_element_set));
+ simgrid::xbt::intrusive_erase(variable_set, *var);
+ variable_set.push_front(*var);
+ 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();
}
if (not var->cnsts.empty())
// 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.
- xbt_swag_remove(var, &variable_set);
- xbt_swag_insert_at_tail(var, &variable_set);
+ 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) {
- xbt_swag_remove(&elem, &(elem.constraint->enabled_element_set));
- xbt_swag_insert_at_tail(&elem, &(elem.constraint->disabled_element_set));
-
- xbt_swag_remove(&elem, &(elem.constraint->active_element_set));
-
+ 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())
+ 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;
- int numelem = xbt_swag_size(&(cnstr->disabled_element_set));
+ int numelem = cnstr->disabled_element_set.size();
if (not numelem)
return;
- lmm_element_t elem = (lmm_element_t)xbt_swag_getFirst(&(cnstr->disabled_element_set));
+ lmm_element_t elem = &cnstr->disabled_element_set.front();
- // Cannot use xbt_swag_foreach, 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 = (lmm_element_t)xbt_swag_getNext(elem, cnstr->disabled_element_set.offset);
+ lmm_element_t 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;
+ } else {
+ nextelem = nullptr;
+ }
if (elem->variable->staged_weight > 0 && elem->variable->can_enable()) {
// Found a staged variable
/* \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_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;
update_modified_set(cnst);
/** \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)
{
- void* _elem;
-
- xbt_swag_foreach(_elem, &cnst->enabled_element_set)
- {
- lmm_variable_t var = ((lmm_element_t)_elem)->variable;
- for (s_lmm_element_t const& elem : var->cnsts) {
+ 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 (elem.constraint != cnst && not xbt_swag_belongs(elem.constraint, &modified_constraint_set)) {
- xbt_swag_insert(elem.constraint, &modified_constraint_set);
- update_modified_set_rec(elem.constraint);
+ 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);
}
}
// var will be ignored in later visits as long as sys->visited_counter does not move
}
}
-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 xbt_swag_belongs(cnst, &modified_constraint_set)) {
- xbt_swag_insert(cnst, &modified_constraint_set);
+ if (selective_update_active && not cnst->modified_constraint_set_hook.is_linked()) {
+ modified_constraint_set.push_back(*cnst);
update_modified_set_rec(cnst);
}
}
-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
// (i.e. not readibily reproducible, and requiring a lot of run time before happening).
if (++visited_counter == 1) {
/* the counter wrapped around, reset each variable->visited */
- void* _var;
- xbt_swag_foreach(_var, &variable_set)((lmm_variable_t)_var)->visited = 0;
+ for (Variable& var : variable_set)
+ var.visited = 0;
}
- xbt_swag_reset(&modified_constraint_set);
+ 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;
- const_xbt_swag_t elem_list = &enabled_element_set;
- void* _elem;
-
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem = (lmm_element_t)_elem;
- if (elem->consumption_weight > 0) {
- if (sharing_policy)
- result += elem->consumption_weight * elem->variable->value;
- else if (result < elem->consumption_weight * elem->variable->value)
- result = std::max(result, elem->consumption_weight * elem->variable->value);
- }
+ if (sharing_policy) {
+ for (Element const& elem : enabled_element_set)
+ if (elem.consumption_weight > 0)
+ result += elem.consumption_weight * elem.variable->value;
+ } else {
+ 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
{
- int result = 0;
- const_xbt_swag_t elem_list = &enabled_element_set;
- void* _elem;
-
- xbt_swag_foreach(_elem, elem_list)
- {
- lmm_element_t elem = (lmm_element_t)_elem;
- if (elem->consumption_weight > 0)
- result++;
- }
- return result;
+ return std::count_if(std::begin(enabled_element_set), std::end(enabled_element_set),
+ [](const Element& elem) { return elem.consumption_weight > 0; });
}
}
}
