X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85e1d2c205ca99512b48bceca0f16677a401e233..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index 002b9c046c..5060a2dac7 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -3,20 +3,9 @@ /* 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)"); @@ -189,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; @@ -213,8 +202,7 @@ 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, int number_of_constraints) { XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", this, id, sharing_weight, bound, number_of_constraints); @@ -302,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); @@ -326,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 @@ -361,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; @@ -429,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); @@ -458,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()); @@ -530,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); } @@ -603,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); @@ -708,7 +698,7 @@ void System::update_variable_bound(Variable* var, double bound) 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; @@ -951,7 +941,7 @@ void System::remove_all_modified_set() 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;