-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2021. 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 "src/kernel/lmm/maxmin.hpp"
-#include "xbt/backtrace.hpp"
+#include <boost/core/demangle.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
-double sg_maxmin_precision = 0.00001; /* Change this with --cfg=maxmin/precision:VALUE */
-double sg_surf_precision = 0.00001; /* Change this with --cfg=surf/precision:VALUE */
+double sg_maxmin_precision = 1E-5; /* Change this with --cfg=maxmin/precision:VALUE */
+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 {
-typedef std::vector<int> dyn_light_t;
+using dyn_light_t = std::vector<int>;
int Variable::next_rank_ = 1;
int Constraint::next_rank_ = 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)
XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
if (selective_update)
- modified_set_ = new kernel::resource::Action::ModifiedSet();
+ modified_set_ = std::make_unique<kernel::resource::Action::ModifiedSet>();
}
System::~System()
Constraint* cnst;
while ((var = extract_variable())) {
- auto demangled = simgrid::xbt::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
- XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.get(),
+ 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_);
var_free(var);
}
cnst_free(cnst);
xbt_mallocator_free(variable_mallocator_);
- delete modified_set_;
}
void System::cnst_free(Constraint* cnst)
Constraint* System::constraint_new(resource::Resource* id, double bound_value)
{
- Constraint* cnst = new Constraint(id, bound_value);
+ auto* cnst = new Constraint(id, bound_value);
insert_constraint(cnst);
return cnst;
}
XBT_IN("(sys=%p, id=%p, penalty=%f, bound=%f, num_cons =%zu)", this, id, sharing_penalty, bound,
number_of_constraints);
- Variable* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
+ auto* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
var->initialize(id, sharing_penalty, bound, number_of_constraints, visited_counter_ - 1);
if (sharing_penalty > 0)
variable_set.push_front(*var);
elem.constraint = cnst;
elem.variable = var;
- if (var->sharing_penalty_) {
+ if (var->sharing_penalty_ != 0.0) {
elem.constraint->enabled_element_set_.push_front(elem);
elem.increase_concurrency();
} else
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;
- if (var->sharing_penalty_)
+ if (var->sharing_penalty_ != 0.0)
elem.decrease_concurrency();
if (cnst->sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE)
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_) {
+ if (var->sharing_penalty_ != 0.0) {
if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
double penalty = var->sharing_penalty_;
disable_var(var);
void System::print() const
{
- std::string buf = std::string("MAX-MIN ( ");
+ std::string buf = "MAX-MIN ( ";
/* Printing Objective */
for (Variable const& var : variable_set)
cnst.usage_ = elem.consumption_weight / elem.variable->sharing_penalty_;
elem.make_active();
- resource::Action* action = static_cast<resource::Action*>(elem.variable->id_);
+ resource::Action* action = elem.variable->id_;
if (modified_set_ && not action->is_within_modified_set())
modified_set_->push_back(*action);
}
min_usage = -1;
min_bound = -1;
saturated_constraints.clear();
- int pos;
- for (pos = 0; pos < cnst_light_num; pos++) {
+ for (int pos = 0; pos < cnst_light_num; pos++) {
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>)"
int Constraint::get_variable_amount() const
{
- return std::count_if(std::begin(enabled_element_set_), std::end(enabled_element_set_),
- [](const Element& elem) { return elem.consumption_weight > 0; });
+ 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; }));
}
} // namespace lmm
