constraint->concurrency_current_ -= get_concurrency();
}
-void Element::increase_concurrency()
+void Element::increase_concurrency(bool check_limit)
{
constraint->concurrency_current_ += get_concurrency();
if (constraint->concurrency_current_ > constraint->concurrency_maximum_)
constraint->concurrency_maximum_ = constraint->concurrency_current_;
- xbt_assert(constraint->get_concurrency_limit() < 0 ||
+ xbt_assert(not check_limit || constraint->get_concurrency_limit() < 0 ||
constraint->concurrency_current_ <= constraint->get_concurrency_limit(),
"Concurrency limit overflow!");
}
for (Element const& elem : cnst.disabled_element_set_) {
// We should have staged variables only if concurrency is reached in some constraint
- xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_penalty_ == 0 ||
- elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share_,
+ xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_sharing_penalty_ == 0 ||
+ elem.variable->get_min_concurrency_slack() == 0,
"should not have staged variable!");
}
// TODOLATER Can do better than that by leaving only the variable in only one enabled_element_set, call
// update_modified_set, and then remove it..
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
for (Element& elem : var->cnsts_) {
if (var->sharing_penalty_ > 0)
variable_free(var);
}
-void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
+Element& System::expand_create_elem(Constraint* cnst, Variable* var, double consumption_weight)
{
- modified_ = true;
-
- // Check if this variable already has an active element in this constraint
- // If it does, subtract it from the required slack
- int current_share = 0;
- if (var->concurrency_share_ > 1) {
- for (const Element& elem : var->cnsts_) {
- if (elem.constraint == cnst && elem.enabled_element_set_hook.is_linked())
- current_share += elem.get_concurrency();
- }
- }
-
- // Check if we need to disable the variable
- if (var->sharing_penalty_ > 0 && var->concurrency_share_ - current_share > cnst->get_concurrency_slack()) {
- double penalty = var->sharing_penalty_;
- disable_var(var);
- for (Element const& elem : var->cnsts_)
- on_disabled_var(elem.constraint);
- consumption_weight = 0;
- var->staged_penalty_ = penalty;
- xbt_assert(not var->sharing_penalty_);
- }
-
xbt_assert(var->cnsts_.size() < var->cnsts_.capacity(), "Too much constraints");
var->cnsts_.emplace_back(cnst, var, consumption_weight);
if (var->sharing_penalty_ != 0.0) {
elem.constraint->enabled_element_set_.push_front(elem);
- elem.increase_concurrency();
} else
elem.constraint->disabled_element_set_.push_back(elem);
- if (not selective_update_active) {
- make_constraint_active(cnst);
- } else if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0) {
+ if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0) {
make_constraint_active(cnst);
- update_modified_set(cnst);
- // TODOLATER: Why do we need this second call?
- if (var->cnsts_.size() > 1)
- update_modified_set(var->cnsts_[0].constraint);
}
+ return elem;
+}
- check_concurrency();
+Element& System::expand_add_to_elem(Element& elem, const Constraint* cnst, double consumption_weight) const
+{
+ elem.max_consumption_weight = std::max(elem.max_consumption_weight, consumption_weight);
+ if (cnst->sharing_policy_ != Constraint::SharingPolicy::FATPIPE)
+ elem.consumption_weight += consumption_weight;
+ else
+ elem.consumption_weight = std::max(elem.consumption_weight, consumption_weight);
+ return elem;
}
-void System::expand_add(Constraint* cnst, Variable* var, double value)
+void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
{
modified_ = true;
- check_concurrency();
-
- // BEWARE: In case you have multiple elements in one constraint, this will always add value to the first element.
auto elem_it =
std::find_if(begin(var->cnsts_), end(var->cnsts_), [&cnst](Element const& x) { return x.constraint == cnst; });
if (elem_it != end(var->cnsts_)) {
- Element& elem = *elem_it;
+ /* before changing it, decreases concurrency on constraint, it'll be added back later */
if (var->sharing_penalty_ != 0.0)
- elem.decrease_concurrency();
+ elem_it->decrease_concurrency();
+ }
+ Element& elem = elem_it != end(var->cnsts_) ? expand_add_to_elem(*elem_it, cnst, consumption_weight)
+ : expand_create_elem(cnst, var, consumption_weight);
- elem.max_consumption_weight = std::max(elem.max_consumption_weight, value);
- if (cnst->sharing_policy_ != Constraint::SharingPolicy::FATPIPE)
- elem.consumption_weight += value;
- else
- elem.consumption_weight = std::max(elem.consumption_weight, value);
-
- // We need to check that increasing value of the element does not cross the concurrency limit
- if (var->sharing_penalty_ != 0.0) {
- if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
- double penalty = var->sharing_penalty_;
- disable_var(var);
- for (Element const& elem2 : var->cnsts_)
- on_disabled_var(elem2.constraint);
- var->staged_penalty_ = penalty;
- xbt_assert(not var->sharing_penalty_);
- }
- elem.increase_concurrency();
+ // Check if we need to disable the variable
+ if (var->sharing_penalty_ != 0) {
+ /* increase concurrency in constraint that this element uses.
+ * as we don't check if constraint has reached its limit before increasing,
+ * we can't check the correct state at increase_concurrency, anyway
+ * it'll check if the slack is smaller than 0 just below */
+ elem.increase_concurrency(false);
+ if (cnst->get_concurrency_slack() < 0) {
+ double penalty = var->sharing_penalty_;
+ disable_var(var);
+ for (Element const& elem2 : var->cnsts_)
+ on_disabled_var(elem2.constraint);
+ var->staged_sharing_penalty_ = penalty;
+ xbt_assert(not var->sharing_penalty_);
}
- update_modified_set(cnst);
- } else
- expand(cnst, var, value);
+ }
+
+ /* update modified constraint set accordingly */
+ if (elem.consumption_weight > 0 || var->sharing_penalty_ > 0)
+ update_modified_cnst_set(cnst);
check_concurrency();
}
}
}
+resource::Action::ModifiedSet* System::get_modified_action_set() const
+{
+ return modified_set_.get();
+}
+
void System::solve()
{
if (not modified_)
do_solve();
modified_ = false;
- if (selective_update_active)
- remove_all_modified_set();
+ if (selective_update_active) {
+ /* update list of modified variables */
+ for (const Constraint& cnst : modified_constraint_set) {
+ for (const Element& elem : cnst.enabled_element_set_) {
+ if (elem.consumption_weight > 0) {
+ resource::Action* action = elem.variable->id_;
+ if (not action->is_within_modified_set())
+ modified_set_->push_back(*action);
+ }
+ }
+ }
+ /* clear list of modified constraint */
+ remove_all_modified_cnst_set();
+ }
if (XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug)) {
print();
if (not var->cnsts_.empty()) {
for (Element const& elem : var->cnsts_) {
- update_modified_set(elem.constraint);
+ update_modified_cnst_set(elem.constraint);
}
}
}
rank_ = next_rank_++;
cnsts_.reserve(number_of_constraints);
sharing_penalty_ = sharing_penalty;
- staged_penalty_ = 0.0;
+ staged_sharing_penalty_ = 0.0;
bound_ = bound_value;
- concurrency_share_ = 1;
value_ = 0.0;
visited_ = visited_value;
mu_ = 0.0;
}
// Small remark: In this implementation of System::enable_var() and System::disable_var(), we will meet multiple times
-// with var when running System::update_modified_set().
-// A priori not a big performance issue, but we might do better by calling System::update_modified_set() within the for
-// loops (after doing the first for enabling==1, and before doing the last for disabling==1)
+// with var when running System::update_modified_cnst_set().
+// A priori not a big performance issue, but we might do better by calling System::update_modified_cnst_set() within the
+// for loops (after doing the first for enabling==1, and before doing the last for disabling==1)
void System::enable_var(Variable* var)
{
xbt_assert(not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug) || var->can_enable());
- var->sharing_penalty_ = var->staged_penalty_;
- var->staged_penalty_ = 0;
+ var->sharing_penalty_ = var->staged_sharing_penalty_;
+ var->staged_sharing_penalty_ = 0;
- // Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_set AFTER
+ // Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_cnst_set AFTER
// moving at least one element of var.
simgrid::xbt::intrusive_erase(variable_set, *var);
elem.constraint->enabled_element_set_.push_front(elem);
elem.increase_concurrency();
}
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
// When used within on_disabled_var, we would get an assertion fail, because transiently there can be variables
// that are staged and could be activated.
void System::disable_var(Variable* var)
{
- xbt_assert(not var->staged_penalty_, "Staged penalty should have been cleared");
- // Disabling the variable, move to var to list tail. Subtlety is: here, we need to call update_modified_set
+ xbt_assert(not var->staged_sharing_penalty_, "Staged penalty should have been cleared");
+ // Disabling the variable, move to var to list tail. Subtlety is: here, we need to call update_modified_cnst_set
// BEFORE moving the last element of var.
simgrid::xbt::intrusive_erase(variable_set, *var);
variable_set.push_back(*var);
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
for (Element& elem : var->cnsts_) {
simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set_, elem);
elem.constraint->disabled_element_set_.push_back(elem);
}
var->sharing_penalty_ = 0.0;
- var->staged_penalty_ = 0.0;
+ var->staged_sharing_penalty_ = 0.0;
var->value_ = 0.0;
check_concurrency();
}
nextelem = nullptr;
}
- if (elem->variable->staged_penalty_ > 0 && elem->variable->can_enable()) {
+ if (elem->variable->staged_sharing_penalty_ > 0 && elem->variable->can_enable()) {
// Found a staged variable
// TODOLATER: Add random timing function to model reservation protocol fuzziness? Then how to make sure that
// staged variables will eventually be called?
// Are we enabling this variable?
if (enabling_var) {
- var->staged_penalty_ = penalty;
+ var->staged_sharing_penalty_ = penalty;
int minslack = var->get_min_concurrency_slack();
- if (minslack < var->concurrency_share_) {
- XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack %i, with penalty %f and concurrency"
- " share %i",
- minslack, penalty, var->concurrency_share_);
+ if (minslack == 0) {
+ XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack is 0");
return;
}
XBT_DEBUG("Enabling var with min concurrency slack %i", minslack);
disable_var(var);
} else {
var->sharing_penalty_ = penalty;
- if (not var->cnsts_.empty())
- update_modified_set(var->cnsts_[0].constraint);
+ update_modified_cnst_set_from_variable(var);
}
check_concurrency();
void System::update_constraint_bound(Constraint* cnst, double bound)
{
modified_ = true;
- update_modified_set(cnst);
+ update_modified_cnst_set(cnst);
cnst->bound_ = bound;
}
* A recursive algorithm to optimize the system recalculation selecting only constraints that have changed. Each
* constraint change is propagated to the list of constraints for each variable.
*/
-void System::update_modified_set_rec(const Constraint* cnst)
+void System::update_modified_cnst_set_rec(const Constraint* cnst)
{
for (Element const& elem : cnst->enabled_element_set_) {
Variable* var = elem.variable;
break;
if (elem2.constraint != cnst && not elem2.constraint->modified_constraint_set_hook_.is_linked()) {
modified_constraint_set.push_back(*elem2.constraint);
- update_modified_set_rec(elem2.constraint);
+ update_modified_cnst_set_rec(elem2.constraint);
}
}
// var will be ignored in later visits as long as sys->visited_counter does not move
}
}
-void System::update_modified_set(Constraint* cnst)
+void System::update_modified_cnst_set_from_variable(const Variable* var)
+{
+ /* nothing to update in these cases:
+ * - selective update not active, all variables are active
+ * - variable doesn't use any constraint
+ * - variable is disabled (sharing penalty <= 0): we iterate only through the enabled_variables in
+ * update_modified_cnst_set_rec */
+ if (not selective_update_active || var->cnsts_.empty() || var->sharing_penalty_ <= 0)
+ return;
+
+ /* Normally, if the conditions above are true, specially variable is enabled, we can call
+ * modified_set over the first contraint only, since the recursion in update_modified_cnst_set_rec
+ * will iterate over the other constraints of this variable */
+ update_modified_cnst_set(var->cnsts_[0].constraint);
+}
+
+void System::update_modified_cnst_set(Constraint* cnst)
{
/* nothing to do if selective update isn't active */
if (selective_update_active && not cnst->modified_constraint_set_hook_.is_linked()) {
modified_constraint_set.push_back(*cnst);
- update_modified_set_rec(cnst);
+ update_modified_cnst_set_rec(cnst);
}
}
-void System::remove_all_modified_set()
+void System::remove_all_modified_cnst_set()
{
// We cleverly un-flag all variables just by incrementing visited_counter
// In effect, the var->visited value will no more be equal to visited counter
