X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..2d37e348a09783cda723c7019640ee69de168324:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index 0b27a670c4..a39eaa646b 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -1,22 +1,11 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ -/* \file callbacks.h */ - #include "src/kernel/lmm/maxmin.hpp" +#include "src/surf/surf_interface.hpp" #include "xbt/backtrace.hpp" -#include "xbt/log.h" -#include "xbt/mallocator.h" -#include "xbt/sysdep.h" -#include "xbt/utility.hpp" -#include -#include -#include -#include -#include -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)"); @@ -117,7 +106,7 @@ void System::check_concurrency() const void System::var_free(Variable* var) { XBT_IN("(sys=%p, var=%p)", this, var); - modified = true; + modified_ = true; // 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.. @@ -144,19 +133,16 @@ void System::var_free(Variable* var) check_concurrency(); - xbt_mallocator_release(variable_mallocator, var); + xbt_mallocator_release(variable_mallocator_, var); XBT_OUT(); } System::System(bool selective_update) : selective_update_active(selective_update) { - modified = false; - visited_counter = 1; - XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active); - variable_mallocator = - xbt_mallocator_new(65536, System::variable_mallocator_new_f, System::variable_mallocator_free_f, nullptr); + if (selective_update) + modified_set_ = new kernel::resource::Action::ModifiedSet(); } System::~System() @@ -173,7 +159,7 @@ System::~System() while ((cnst = extract_constraint())) cnst_free(cnst); - xbt_mallocator_free(variable_mallocator); + xbt_mallocator_free(variable_mallocator_); delete modified_set_; } @@ -192,7 +178,7 @@ Constraint::Constraint(void* id_value, double bound_value) : bound(bound_value), concurrency_limit = sg_concurrency_limit; concurrency_current = 0; concurrency_maximum = 0; - sharing_policy = 1; /* FIXME: don't hardcode the value */ + sharing_policy = s4u::Link::SharingPolicy::SHARED; lambda = 0.0; new_lambda = 0.0; @@ -216,14 +202,13 @@ void System::variable_mallocator_free_f(void* var) delete static_cast(var); } -Variable* System::variable_new(simgrid::kernel::resource::Action* id, double sharing_weight, double bound, - int number_of_constraints) +Variable* System::variable_new(resource::Action* id, double sharing_weight, double bound, size_t 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 =%zu)", this, id, sharing_weight, bound, number_of_constraints); - Variable* var = static_cast(xbt_mallocator_get(variable_mallocator)); - var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter - 1); - if (sharing_weight) + Variable* var = static_cast(xbt_mallocator_get(variable_mallocator_)); + var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter_ - 1); + if (sharing_weight > 0) variable_set.push_front(*var); else variable_set.push_back(*var); @@ -240,7 +225,7 @@ void System::variable_free(Variable* var) void System::expand(Constraint* cnst, Variable* var, double consumption_weight) { - modified = true; + modified_ = true; // Check if this variable already has an active element in this constraint // If it does, substract it from the required slack @@ -293,7 +278,7 @@ void System::expand(Constraint* cnst, Variable* var, double consumption_weight) void System::expand_add(Constraint* cnst, Variable* var, double value) { - modified = true; + modified_ = true; check_concurrency(); @@ -305,7 +290,7 @@ void System::expand_add(Constraint* cnst, Variable* var, double value) if (var->sharing_weight) elem.decrease_concurrency(); - if (cnst->sharing_policy) + if (cnst->sharing_policy != s4u::Link::SharingPolicy::FATPIPE) elem.consumption_weight += value; else elem.consumption_weight = std::max(elem.consumption_weight, value); @@ -329,7 +314,7 @@ void System::expand_add(Constraint* cnst, Variable* var, double value) check_concurrency(); } -Variable* Constraint::get_variable(const_lmm_element_t* elem) const +Variable* Constraint::get_variable(const Element** elem) const { if (*elem == nullptr) { // That is the first call, pick the first element among enabled_element_set (or disabled_element_set if @@ -364,7 +349,7 @@ Variable* 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 -Variable* Constraint::get_variable_safe(const_lmm_element_t* elem, const_lmm_element_t* nextelem, int* numelem) const +Variable* Constraint::get_variable_safe(const Element** elem, const Element** nextelem, int* numelem) const { if (*elem == nullptr) { *numelem = enabled_element_set.size() + disabled_element_set.size() - 1; @@ -432,12 +417,14 @@ static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab } template -static void format_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf) +static void format_element_list(const ElemList& elem_list, s4u::Link::SharingPolicy sharing_policy, double& sum, + std::string& buf) { for (Element const& elem : elem_list) { buf += std::to_string(elem.consumption_weight) + ".'" + std::to_string(elem.variable->id_int) + "'(" + - std::to_string(elem.variable->value) + ")" + (sharing_policy ? " + " : " , "); - if (sharing_policy) + std::to_string(elem.variable->value) + ")" + + (sharing_policy != s4u::Link::SharingPolicy::FATPIPE ? " + " : " , "); + if (sharing_policy != s4u::Link::SharingPolicy::FATPIPE) sum += elem.consumption_weight * elem.variable->value; else sum = std::max(sum, elem.consumption_weight * elem.variable->value); @@ -461,14 +448,14 @@ void System::print() const double sum = 0.0; // Show the enabled variables buf += "\t"; - buf += cnst.sharing_policy ? "(" : "max("; + buf += cnst.sharing_policy != s4u::Link::SharingPolicy::FATPIPE ? "(" : "max("; format_element_list(cnst.enabled_element_set, cnst.sharing_policy, sum, buf); // TODO: Adding disabled elements only for test compatibility, but do we really want them to be printed? format_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf); buf += "0) <= " + std::to_string(cnst.bound) + " ('" + std::to_string(cnst.id_int) + "')"; - if (not cnst.sharing_policy) { + if (cnst.sharing_policy == s4u::Link::SharingPolicy::FATPIPE) { buf += " [MAX-Constraint]"; } XBT_DEBUG("%s", buf.c_str()); @@ -492,7 +479,7 @@ void System::print() const void System::lmm_solve() { - if (modified) { + if (modified_) { XBT_IN("(sys=%p)", this); /* Compute Usage and store the variables that reach the maximum. If selective_update_active is true, only * constraints that changed are considered. Otherwise all constraints with active actions are considered. @@ -533,13 +520,13 @@ template void System::lmm_solve(CnstList& cnst_list) for (Element& elem : cnst.enabled_element_set) { xbt_assert(elem.variable->sharing_weight > 0); if (elem.consumption_weight > 0) { - if (cnst.sharing_policy) + if (cnst.sharing_policy != s4u::Link::SharingPolicy::FATPIPE) cnst.usage += elem.consumption_weight / elem.variable->sharing_weight; else if (cnst.usage < elem.consumption_weight / elem.variable->sharing_weight) cnst.usage = elem.consumption_weight / elem.variable->sharing_weight; elem.make_active(); - simgrid::kernel::resource::Action* action = static_cast(elem.variable->id); + resource::Action* action = static_cast(elem.variable->id); if (modified_set_ && not action->is_within_modified_set()) modified_set_->push_back(*action); } @@ -606,7 +593,7 @@ template void System::lmm_solve(CnstList& cnst_list) /* Update the usage of contraints where this variable is involved */ for (Element& elem : var.cnsts) { Constraint* cnst = elem.constraint; - if (cnst->sharing_policy) { + if (cnst->sharing_policy != s4u::Link::SharingPolicy::FATPIPE) { // 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); double_update(&(cnst->usage), elem.consumption_weight / var.sharing_weight, sg_maxmin_precision); @@ -681,7 +668,7 @@ template void System::lmm_solve(CnstList& cnst_list) } while (cnst_light_num > 0); - modified = false; + modified_ = false; if (selective_update_active) remove_all_modified_set(); @@ -694,24 +681,24 @@ template void System::lmm_solve(CnstList& cnst_list) delete[] cnst_light_tab; } -/** \brief Attribute the value bound to var->bound. +/** @brief Attribute the value bound to var->bound. * - * \param var the Variable* - * \param bound the new bound to associate with var + * @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. */ void System::update_variable_bound(Variable* var, double bound) { - modified = true; + modified_ = true; var->bound = bound; if (not var->cnsts.empty()) update_modified_set(var->cnsts[0].constraint); } -void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value, +void Variable::initialize(resource::Action* id_value, double sharing_weight_value, double bound_value, int number_of_constraints, unsigned visited_value) { id = id_value; @@ -845,7 +832,7 @@ void System::on_disabled_var(Constraint* cnstr) // Anyway, caller functions all call check_concurrency() in the end. } -/* \brief update the weight of a variable, and enable/disable it. +/* @brief update the weight of a variable, and enable/disable it. * @return Returns whether a change was made */ void System::update_variable_weight(Variable* var, double weight) @@ -860,7 +847,7 @@ void System::update_variable_weight(Variable* var, double weight) XBT_IN("(sys=%p, var=%p, weight=%f)", this, var, weight); - modified = true; + modified_ = true; // Are we enabling this variable? if (enabling_var) { @@ -888,15 +875,15 @@ void System::update_variable_weight(Variable* var, double weight) void System::update_constraint_bound(Constraint* cnst, double bound) { - modified = true; + modified_ = true; update_modified_set(cnst); cnst->bound = bound; } -/** \brief Update the constraint set propagating recursively to other constraints so the system should not be entirely +/** @brief Update the constraint set propagating recursively to other constraints so the system should not be entirely * computed. * - * \param cnst the Constraint* 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. @@ -906,7 +893,7 @@ void System::update_modified_set_rec(Constraint* cnst) for (Element const& elem : cnst->enabled_element_set) { Variable* var = elem.variable; for (Element const& elem2 : var->cnsts) { - if (var->visited == visited_counter) + if (var->visited == visited_counter_) break; if (elem2.constraint != cnst && not elem2.constraint->modified_constraint_set_hook.is_linked()) { modified_constraint_set.push_back(*elem2.constraint); @@ -914,7 +901,7 @@ void System::update_modified_set_rec(Constraint* cnst) } } // var will be ignored in later visits as long as sys->visited_counter does not move - var->visited = visited_counter; + var->visited = visited_counter_; } } @@ -934,7 +921,7 @@ void System::remove_all_modified_set() // To be clean, when visited counter has wrapped around, we force these var->visited values so that variables that // were in the modified a long long time ago are not wrongly skipped here, which would lead to very nasty bugs // (i.e. not readibily reproducible, and requiring a lot of run time before happening). - if (++visited_counter == 1) { + if (++visited_counter_ == 1) { /* the counter wrapped around, reset each variable->visited */ for (Variable& var : variable_set) var.visited = 0; @@ -945,16 +932,16 @@ void System::remove_all_modified_set() /** * Returns resource load (in flop per second, or byte per second, or similar) * - * If the resource is shared (the default case), the load is sum of resource usage made by every variables located on - * this resource. + * If the resource is shared (the default case), the load is sum of resource usage made by + * every variables located on this resource. * - * If the resource is not shared (ie in FATPIPE mode), then the load is the max (not the sum) of all resource usages - * located on this resource. + * If the resource is not shared (ie in FATPIPE mode), then the load is the max (not the sum) + * of all resource usages located on this resource. */ double Constraint::get_usage() const { double result = 0.0; - if (sharing_policy) { + if (sharing_policy != s4u::Link::SharingPolicy::FATPIPE) { for (Element const& elem : enabled_element_set) if (elem.consumption_weight > 0) result += elem.consumption_weight * elem.variable->value;