double sg_surf_precision = 1E-9; /* Change this with --cfg=surf/precision:VALUE */
int sg_concurrency_limit = -1; /* Change this with --cfg=maxmin/concurrency-limit:VALUE */
-namespace simgrid {
-namespace kernel {
-namespace lmm {
+namespace simgrid::kernel::lmm {
int Variable::next_rank_ = 1;
int Constraint::next_rank_ = 1;
int Element::get_concurrency() const
{
+ // just to try having the computation of the concurrency
+ if (constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
+ return 1;
+ }
+
// Ignore element with weight less than one (e.g. cross-traffic)
return (consumption_weight >= 1) ? 1 : 0;
// There are other alternatives, but they will change the behavior of the model..
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 ||
+ 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!");
}
System::~System()
{
while (Variable* var = extract_variable()) {
- std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
- XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
- var->rank_);
+ const char* name = var->id_ ? typeid(*var->id_).name() : "(unidentified)";
+ boost::core::scoped_demangled_name demangled(name);
+ XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.",
+ demangled.get() ? demangled.get() : name, var->rank_);
var_free(var);
}
while (Constraint* cnst = extract_constraint())
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_)) {
+ if (elem_it != end(var->cnsts_) && var->sharing_penalty_ != 0.0) {
/* before changing it, decreases concurrency on constraint, it'll be added back later */
- if (var->sharing_penalty_ != 0.0)
- elem_it->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);
disable_var(var);
for (Element const& elem2 : var->cnsts_)
on_disabled_var(elem2.constraint);
- var->staged_penalty_ = penalty;
+ var->staged_sharing_penalty_ = penalty;
xbt_assert(not var->sharing_penalty_);
}
}
*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 ((*elem)->enabled_element_set_hook.is_linked()) {
*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) {
rank_ = next_rank_++;
cnsts_.reserve(number_of_constraints);
sharing_penalty_ = sharing_penalty;
- staged_penalty_ = 0.0;
+ staged_sharing_penalty_ = 0.0;
bound_ = bound_value;
value_ = 0.0;
visited_ = visited_value;
{
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_cnst_set AFTER
// moving at least one element of var.
void System::disable_var(Variable* var)
{
- xbt_assert(not var->staged_penalty_, "Staged penalty should have been cleared");
+ 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);
}
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 == 0) {
XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack is 0");
return result;
}
-int Constraint::get_variable_amount() const
-{
- return static_cast<int>(std::count_if(std::begin(enabled_element_set_), std::end(enabled_element_set_),
- [](const Element& elem) { return elem.consumption_weight > 0; }));
-}
-
void Constraint::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb)
{
- xbt_assert(policy == SharingPolicy::NONLINEAR || not cb,
+ xbt_assert(policy == SharingPolicy::NONLINEAR || policy == SharingPolicy::WIFI || not cb,
"Invalid sharing policy for constraint. Callback should be used with NONLINEAR sharing policy");
sharing_policy_ = policy;
dyn_constraint_cb_ = cb;
}
-} // namespace lmm
-} // namespace kernel
-} // namespace simgrid
\ No newline at end of file
+} // namespace simgrid::kernel::lmm
