X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e902ba6f18c458c914be7fda34595958d837e762..52c11fc61cb2dd17d276c67aaaa522085389c39e:/src/kernel/lmm/fair_bottleneck.cpp diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp index 7cf24affb2..94cb1834a0 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,29 +10,28 @@ #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) +simgrid::kernel::lmm::System* simgrid::kernel::lmm::make_new_fair_bottleneck_system(bool selective_update) { - void* _elem; - lmm_element_t elem = nullptr; - xbt_swag_t elem_list = nullptr; + return new simgrid::kernel::lmm::FairBottleneck(selective_update); +} - if (not sys->modified) +void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve() +{ + if (not modified) return; - XBT_DEBUG("Variable set : %zu", sys->variable_set.size()); - for (s_lmm_variable_t& var : sys->variable_set) { + XBT_DEBUG("Variable set : %zu", variable_set.size()); + for (Variable& var : 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), [](s_lmm_element_t const& x) { + 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); + 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) @@ -41,11 +39,11 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } } - XBT_DEBUG("Active constraints : %zu", sys->active_constraint_set.size()); - for (s_lmm_constraint_t& cnst : sys->active_constraint_set) { - sys->saturated_constraint_set.push_back(cnst); + XBT_DEBUG("Active constraints : %zu", active_constraint_set.size()); + for (Constraint& cnst : active_constraint_set) { + saturated_constraint_set.push_back(cnst); } - for (s_lmm_constraint_t& cnst : sys->saturated_constraint_set) { + for (Constraint& cnst : saturated_constraint_set) { cnst.remaining = cnst.bound; cnst.usage = 0.0; } @@ -55,25 +53,22 @@ 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; + auto& var_list = saturated_variable_set; + auto& cnst_list = saturated_constraint_set; do { if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) { XBT_DEBUG("Fair bottleneck done"); - sys->print(); + print(); } 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 && elem->variable->saturated_variable_set_hook.is_linked()) + 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); @@ -91,9 +86,9 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } for (auto iter = std::begin(var_list); iter != std::end(var_list);) { - s_lmm_variable_t& var = *iter; + 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); } @@ -109,26 +104,23 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } 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); } @@ -137,14 +129,12 @@ 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 && elem->variable->saturated_variable_set_hook.is_linked()) { - XBT_DEBUG("\t\tGet rid of variable %p", elem->variable); - var_list.erase(var_list.iterator_to(*elem->variable)); + 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 { @@ -154,9 +144,9 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys) } while (not var_list.empty()); cnst_list.clear(); - sys->modified = true; + modified = true; if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) { XBT_DEBUG("Fair bottleneck done"); - sys->print(); + print(); } }