X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52b5d4fb3c307a34756d8a95aadf79d01af14cdd..ccf671a80a47f0489c33fb1dc2a8aadfc28b5b88:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index bf8777530c..bd13a0a405 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -1,31 +1,26 @@ -/* 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 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 dyn_light_t; +using dyn_light_t = std::vector; 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) @@ -141,7 +136,7 @@ System::System(bool selective_update) : selective_update_active(selective_update 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(); } System::~System() @@ -150,8 +145,8 @@ 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); } @@ -159,7 +154,6 @@ System::~System() cnst_free(cnst); xbt_mallocator_free(variable_mallocator_); - delete modified_set_; } void System::cnst_free(Constraint* cnst) @@ -175,7 +169,7 @@ Constraint::Constraint(resource::Resource* id_value, double bound_value) : bound 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; } @@ -195,7 +189,7 @@ Variable* System::variable_new(resource::Action* id, double sharing_penalty, dou 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(xbt_mallocator_get(variable_mallocator_)); + auto* var = static_cast(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); @@ -253,7 +247,7 @@ void System::expand(Constraint* cnst, Variable* var, double consumption_weight) 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 @@ -283,7 +277,7 @@ void System::expand_add(Constraint* cnst, Variable* var, double value) 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) @@ -292,7 +286,7 @@ void System::expand_add(Constraint* cnst, Variable* var, double value) 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); @@ -428,7 +422,7 @@ static void format_element_list(const ElemList& elem_list, s4u::Link::SharingPol void System::print() const { - std::string buf = std::string("MAX-MIN ( "); + std::string buf = "MAX-MIN ( "; /* Printing Objective */ for (Variable const& var : variable_set) @@ -514,7 +508,7 @@ template void System::lmm_solve(CnstList& cnst_list) cnst.usage_ = elem.consumption_weight / elem.variable->sharing_penalty_; elem.make_active(); - resource::Action* action = static_cast(elem.variable->id_); + resource::Action* action = elem.variable->id_; if (modified_set_ && not action->is_within_modified_set()) modified_set_->push_back(*action); } @@ -645,8 +639,7 @@ template void System::lmm_solve(CnstList& cnst_list) 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:)" @@ -939,8 +932,8 @@ double Constraint::get_usage() const 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(std::count_if(std::begin(enabled_element_set_), std::end(enabled_element_set_), + [](const Element& elem) { return elem.consumption_weight > 0; })); } } // namespace lmm