X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddbd28f29ffd7e177e74346e029bcf0dbfea7dbc..265e908745398dd4e9cc55187aa267650468c57c:/src/kernel/lmm/fair_bottleneck.cpp diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp index 88c0625603..cd43352447 100644 --- a/src/kernel/lmm/fair_bottleneck.cpp +++ b/src/kernel/lmm/fair_bottleneck.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2011, 2013-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -11,49 +10,38 @@ #include #include #include +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin); #define SHOW_EXPR_G(expr) XBT_DEBUG(#expr " = %g", expr); #define SHOW_EXPR_D(expr) XBT_DEBUG(#expr " = %d", expr); #define SHOW_EXPR_P(expr) XBT_DEBUG(#expr " = %p", expr); -void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) +void simgrid::kernel::lmm::bottleneck_solve(lmm::System* sys) { - void* _var; - void* _var_next; - void* _elem; - lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; - xbt_swag_t var_list = nullptr; - xbt_swag_t elem_list = nullptr; - if (not sys->modified) return; - var_list = &(sys->variable_set); - XBT_DEBUG("Variable set : %d", xbt_swag_size(var_list)); - xbt_swag_foreach(_var, var_list) - { - var = static_cast(_var); - var->value = 0.0; - XBT_DEBUG("Handling variable %p", var); - if (var->sharing_weight > 0.0 && std::find_if(begin(var->cnsts), end(var->cnsts), [](s_lmm_element_t const& x) { - return x.consumption_weight != 0.0; - }) != end(var->cnsts)) { - xbt_swag_insert(var, &(sys->saturated_variable_set)); + XBT_DEBUG("Variable set : %zu", sys->variable_set.size()); + for (Variable& var : sys->variable_set) { + var.value = 0.0; + XBT_DEBUG("Handling variable %p", &var); + if (var.sharing_weight > 0.0 && std::find_if(begin(var.cnsts), end(var.cnsts), [](Element const& x) { + return x.consumption_weight != 0.0; + }) != end(var.cnsts)) { + sys->saturated_variable_set.push_back(var); } else { - XBT_DEBUG("Err, finally, there is no need to take care of variable %p", var); - if (var->sharing_weight > 0.0) - var->value = 1.0; + XBT_DEBUG("Err, finally, there is no need to take care of variable %p", &var); + if (var.sharing_weight > 0.0) + var.value = 1.0; } } - var_list = &(sys->saturated_variable_set); XBT_DEBUG("Active constraints : %zu", sys->active_constraint_set.size()); - for (s_lmm_constraint_t& cnst : sys->active_constraint_set) { + for (Constraint& cnst : sys->active_constraint_set) { sys->saturated_constraint_set.push_back(cnst); } - for (s_lmm_constraint_t& cnst : sys->saturated_constraint_set) { + for (Constraint& cnst : sys->saturated_constraint_set) { cnst.remaining = cnst.bound; cnst.usage = 0.0; } @@ -63,6 +51,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) /* * Compute Usage and store the variables that reach the maximum. */ + auto& var_list = sys->saturated_variable_set; auto& cnst_list = sys->saturated_constraint_set; do { if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) { @@ -71,16 +60,13 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } XBT_DEBUG("******* Constraints to process: %zu *******", cnst_list.size()); for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) { - s_lmm_constraint_t& cnst = *iter; + Constraint& cnst = *iter; int nb = 0; XBT_DEBUG("Processing cnst %p ", &cnst); - elem_list = &cnst.enabled_element_set; cnst.usage = 0.0; - xbt_swag_foreach(_elem, elem_list) - { - elem = static_cast(_elem); - xbt_assert(elem->variable->sharing_weight > 0); - if ((elem->consumption_weight > 0) && xbt_swag_belongs(elem->variable, var_list)) + for (Element& elem : cnst.enabled_element_set) { + xbt_assert(elem.variable->sharing_weight > 0); + if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked()) nb++; } XBT_DEBUG("\tThere are %d variables", nb); @@ -97,45 +83,42 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } } - xbt_swag_foreach_safe(_var, _var_next, var_list) - { - var = static_cast(_var); + for (auto iter = std::begin(var_list); iter != std::end(var_list);) { + Variable& var = *iter; double min_inc = DBL_MAX; - for (s_lmm_element_t const& elm : var->cnsts) { + for (Element const& elm : var.cnsts) { if (elm.consumption_weight > 0) min_inc = std::min(min_inc, elm.constraint->usage / elm.consumption_weight); } - if (var->bound > 0) - min_inc = std::min(min_inc, var->bound - var->value); - var->mu = min_inc; - XBT_DEBUG("Updating variable %p maximum increment: %g", var, var->mu); - var->value += var->mu; - if (var->value == var->bound) { - xbt_swag_remove(var, var_list); - } + if (var.bound > 0) + min_inc = std::min(min_inc, var.bound - var.value); + var.mu = min_inc; + XBT_DEBUG("Updating variable %p maximum increment: %g", &var, var.mu); + var.value += var.mu; + if (var.value == var.bound) + iter = var_list.erase(iter); + else + iter++; } for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) { - s_lmm_constraint_t& cnst = *iter; + Constraint& cnst = *iter; XBT_DEBUG("Updating cnst %p ", &cnst); - elem_list = &cnst.enabled_element_set; - xbt_swag_foreach(_elem, elem_list) - { - elem = static_cast(_elem); - xbt_assert(elem->variable->sharing_weight > 0); - if (cnst.sharing_policy) { - XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g", &cnst, cnst.remaining, elem->variable, - elem->variable->mu); - double_update(&cnst.remaining, elem->consumption_weight * elem->variable->mu, sg_maxmin_precision); - } else { + if (cnst.sharing_policy) { + for (Element& elem : cnst.enabled_element_set) { + xbt_assert(elem.variable->sharing_weight > 0); + XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g", &cnst, cnst.remaining, elem.variable, + elem.variable->mu); + double_update(&cnst.remaining, elem.consumption_weight * elem.variable->mu, sg_maxmin_precision); + } + } else { + for (Element& elem : cnst.enabled_element_set) { + xbt_assert(elem.variable->sharing_weight > 0); XBT_DEBUG("\tNon-Shared variable. Update constraint usage of %p (%g) with variable %p by %g", &cnst, - cnst.usage, elem->variable, elem->variable->mu); - cnst.usage = std::min(cnst.usage, elem->consumption_weight * elem->variable->mu); + cnst.usage, elem.variable, elem.variable->mu); + cnst.usage = std::min(cnst.usage, elem.consumption_weight * elem.variable->mu); } - } - if (not cnst.sharing_policy) { XBT_DEBUG("\tUpdate constraint %p (%g) by %g", &cnst, cnst.remaining, cnst.usage); - double_update(&cnst.remaining, cnst.usage, sg_maxmin_precision); } @@ -144,21 +127,19 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) XBT_DEBUG("\tGet rid of constraint %p", &cnst); iter = cnst_list.erase(iter); - xbt_swag_foreach(_elem, elem_list) - { - elem = static_cast(_elem); - if (elem->variable->sharing_weight <= 0) + for (Element& elem : cnst.enabled_element_set) { + if (elem.variable->sharing_weight <= 0) break; - if (elem->consumption_weight > 0) { - XBT_DEBUG("\t\tGet rid of variable %p", elem->variable); - xbt_swag_remove(elem->variable, var_list); + if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked()) { + XBT_DEBUG("\t\tGet rid of variable %p", elem.variable); + simgrid::xbt::intrusive_erase(var_list, *elem.variable); } } } else { iter++; } } - } while (xbt_swag_size(var_list)); + } while (not var_list.empty()); cnst_list.clear(); sys->modified = true;