A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill spurious #ifdef MATH.
[simgrid.git]
/
src
/
kernel
/
lmm
/
maxmin.cpp
diff --git
a/src/kernel/lmm/maxmin.cpp
b/src/kernel/lmm/maxmin.cpp
index
633dc21
..
42de206
100644
(file)
--- a/
src/kernel/lmm/maxmin.cpp
+++ b/
src/kernel/lmm/maxmin.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
8
. 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. */
/* 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. */
@@
-33,6
+33,11
@@
typedef std::vector<int> dyn_light_t;
int Variable::Global_debug_id = 1;
int Constraint::Global_debug_id = 1;
int Variable::Global_debug_id = 1;
int Constraint::Global_debug_id = 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)
int Element::get_concurrency() const
{
// Ignore element with weight less than one (e.g. cross-traffic)
@@
-109,7
+114,7
@@
void System::check_concurrency() const
}
}
}
}
-void System::var_free(
lmm_variable_t
var)
+void System::var_free(
Variable*
var)
{
XBT_IN("(sys=%p, var=%p)", this, var);
modified = true;
{
XBT_IN("(sys=%p, var=%p)", this, var);
modified = true;
@@
-150,16
+155,14
@@
System::System(bool selective_update) : selective_update_active(selective_update
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
- keep_track = nullptr;
variable_mallocator =
xbt_mallocator_new(65536, System::variable_mallocator_new_f, System::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;
}
System::~System()
{
}
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 ((var = extract_variable())) {
auto demangled = simgrid::xbt::demangle(typeid(*var->id).name());
@@
-171,9
+174,10
@@
System::~System()
cnst_free(cnst);
xbt_mallocator_free(variable_mallocator);
cnst_free(cnst);
xbt_mallocator_free(variable_mallocator);
+ delete modified_set_;
}
}
-void System::cnst_free(
lmm_constraint_t
cnst)
+void System::cnst_free(
Constraint*
cnst)
{
make_constraint_inactive(cnst);
delete cnst;
{
make_constraint_inactive(cnst);
delete cnst;
@@
-195,9
+199,9
@@
Constraint::Constraint(void* id_value, double bound_value) : bound(bound_value),
cnst_light = nullptr;
}
cnst_light = nullptr;
}
-
lmm_constraint_t
System::constraint_new(void* id, double bound_value)
+
Constraint*
System::constraint_new(void* id, double bound_value)
{
{
-
lmm_constraint_t
cnst = new Constraint(id, bound_value);
+
Constraint*
cnst = new Constraint(id, bound_value);
insert_constraint(cnst);
return cnst;
}
insert_constraint(cnst);
return cnst;
}
@@
-209,15
+213,15
@@
void* System::variable_mallocator_new_f()
void System::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 System::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);
{
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)
variable_set.push_front(*var);
var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter - 1);
if (sharing_weight)
variable_set.push_front(*var);
@@
-228,13
+232,13
@@
lmm_variable_t System::variable_new(simgrid::surf::Action* id, double sharing_we
return var;
}
return var;
}
-void System::variable_free(
lmm_variable_t
var)
+void System::variable_free(
Variable*
var)
{
remove_variable(var);
var_free(var);
}
{
remove_variable(var);
var_free(var);
}
-void System::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;
@@
-287,7
+291,7
@@
void System::expand(lmm_constraint_t cnst, lmm_variable_t var, double consumptio
check_concurrency();
}
check_concurrency();
}
-void System::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;
@@
-325,7
+329,7
@@
void System::expand_add(lmm_constraint_t cnst, lmm_variable_t var, double value)
check_concurrency();
}
check_concurrency();
}
-
lmm_variable_t
Constraint::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 (*elem == nullptr) {
// That is the first call, pick the first element among enabled_element_set (or disabled_element_set if
@@
-360,8
+364,7
@@
lmm_variable_t Constraint::get_variable(const_lmm_element_t* elem) 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
// 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 Constraint::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;
{
if (*elem == nullptr) {
*numelem = enabled_element_set.size() + disabled_element_set.size() - 1;
@@
-413,7
+416,7
@@
static inline void saturated_constraints_update(double usage, int cnst_light_num
}
static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab,
}
static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab,
- const dyn_light_t& saturated_constraints,
lmm_system_t
sys)
+ 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)*/
{
/* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate
* (cnst_light_tab)*/
@@
-487,7
+490,7
@@
void System::print() const
}
}
}
}
-void System::solve()
+void System::
lmm_
solve()
{
if (modified) {
XBT_IN("(sys=%p)", this);
{
if (modified) {
XBT_IN("(sys=%p)", this);
@@
-495,14
+498,14
@@
void System::solve()
* constraints that changed are considered. Otherwise all constraints with active actions are considered.
*/
if (selective_update_active)
* 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
else
- solve(active_constraint_set);
+
lmm_
solve(active_constraint_set);
XBT_OUT();
}
}
XBT_OUT();
}
}
-template <class CnstList> void System::solve(CnstList& cnst_list)
+template <class CnstList> void System::
lmm_
solve(CnstList& cnst_list)
{
double min_usage = -1;
double min_bound = -1;
{
double min_usage = -1;
double min_bound = -1;
@@
-536,9
+539,9
@@
template <class CnstList> void System::solve(CnstList& cnst_list)
cnst.usage = elem.consumption_weight / elem.variable->sharing_weight;
elem.make_active();
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,
}
}
XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst.id_int, cnst.usage,
@@
-602,7
+605,7
@@
template <class CnstList> void System::solve(CnstList& cnst_list)
/* Update the usage of contraints where this variable is involved */
for (Element& elem : var.cnsts) {
/* Update the usage of contraints where this variable is involved */
for (Element& elem : var.cnsts) {
-
lmm_constraint_t
cnst = elem.constraint;
+
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);
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);
@@
-691,20
+694,15
@@
template <class CnstList> void System::solve(CnstList& cnst_list)
delete[] cnst_light_tab;
}
delete[] cnst_light_tab;
}
-void lmm_solve(lmm_system_t sys)
-{
- sys->solve();
-}
-
/** \brief Attribute the value bound to var->bound.
*
/** \brief Attribute the value bound to var->bound.
*
- * \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.
*/
* \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 System::update_variable_bound(
lmm_variable_t
var, double bound)
+void System::update_variable_bound(
Variable*
var, double bound)
{
modified = true;
var->bound = bound;
{
modified = true;
var->bound = bound;
@@
-713,7
+711,7
@@
void System::update_variable_bound(lmm_variable_t var, double bound)
update_modified_set(var->cnsts[0].constraint);
}
update_modified_set(var->cnsts[0].constraint);
}
-void Variable::initialize(simgrid::
surf
::Action* id_value, double sharing_weight_value, double bound_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;
int number_of_constraints, unsigned visited_value)
{
id = id_value;
@@
-754,7
+752,7
@@
int Variable::get_min_concurrency_slack() const
// with var when running System::update_modified_set().
// A priori not a big performance issue, but we might do better by calling System::update_modified_set() within the for
// loops (after doing the first for enabling==1, and before doing the last for disabling==1)
// with var when running System::update_modified_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(
lmm_variable_t
var)
+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(surf_maxmin, xbt_log_priority_debug) || var->can_enable());
@@
-779,7
+777,7
@@
void System::enable_var(lmm_variable_t var)
// Anyway, caller functions all call check_concurrency() in the end.
}
// Anyway, caller functions all call check_concurrency() in the end.
}
-void System::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
{
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
@@
-809,7
+807,7
@@
void System::disable_var(lmm_variable_t var)
* 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 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 System::on_disabled_var(
lmm_constraint_t
cnstr)
+void System::on_disabled_var(
Constraint*
cnstr)
{
if (cnstr->get_concurrency_limit() < 0)
return;
{
if (cnstr->get_concurrency_limit() < 0)
return;
@@
-818,12
+816,12
@@
void System::on_disabled_var(lmm_constraint_t cnstr)
if (not numelem)
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 System::enable_var() will modify disabled_element_set.. within the loop
while (numelem-- && elem) {
// 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;
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;
@@
-853,7
+851,7
@@
void System::on_disabled_var(lmm_constraint_t cnstr)
/* \brief update the weight of a variable, and enable/disable it.
* @return Returns whether a change was made
*/
/* \brief update the weight of a variable, and enable/disable it.
* @return Returns whether a change was made
*/
-void System::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_assert(weight >= 0, "Variable weight should not be negative!");
@@
-891,7
+889,7
@@
void System::update_variable_weight(lmm_variable_t var, double weight)
XBT_OUT();
}
XBT_OUT();
}
-void System::update_constraint_bound(
lmm_constraint_t
cnst, double bound)
+void System::update_constraint_bound(
Constraint*
cnst, double bound)
{
modified = true;
update_modified_set(cnst);
{
modified = true;
update_modified_set(cnst);
@@
-901,15
+899,15
@@
void System::update_constraint_bound(lmm_constraint_t cnst, double bound)
/** \brief Update the constraint set propagating recursively to other constraints so the system should not be entirely
* computed.
*
/** \brief Update the constraint set propagating recursively to other constraints so the system should not be entirely
* computed.
*
- * \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.
*/
*
* 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(
lmm_constraint_t
cnst)
+void System::update_modified_set_rec(
Constraint*
cnst)
{
for (Element const& elem : cnst->enabled_element_set) {
{
for (Element const& elem : cnst->enabled_element_set) {
-
lmm_variable_t
var = elem.variable;
+
Variable*
var = elem.variable;
for (Element const& elem2 : var->cnsts) {
if (var->visited == visited_counter)
break;
for (Element const& elem2 : var->cnsts) {
if (var->visited == visited_counter)
break;
@@
-923,7
+921,7
@@
void System::update_modified_set_rec(lmm_constraint_t cnst)
}
}
}
}
-void System::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()) {
{
/* nothing to do if selective update isn't active */
if (selective_update_active && not cnst->modified_constraint_set_hook.is_linked()) {