X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b867af718c91a3279c07e08ab9bcf164ff64466..17c819afc4ceda4000eec137c8fee35168253b4d:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index 8bd4ecad4b..adeee26ea5 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)"); @@ -33,6 +22,11 @@ typedef std::vector dyn_light_t; int Variable::Global_debug_id = 1; int Constraint::Global_debug_id = 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) @@ -112,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.. @@ -139,20 +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); - solve_fun = &lmm_solve; + if (selective_update) + modified_set_ = new kernel::resource::Action::ModifiedSet(); } System::~System() @@ -169,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_; } @@ -217,8 +207,8 @@ Variable* System::variable_new(simgrid::kernel::resource::Action* id, double sha { XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", 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); + 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_set.push_front(*var); else @@ -236,7 +226,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 @@ -289,7 +279,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(); @@ -325,7 +315,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 @@ -360,7 +350,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; @@ -486,22 +476,22 @@ void System::print() const } } -void System::solve() +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. */ if (selective_update_active) - solve(modified_constraint_set); + lmm_solve(modified_constraint_set); else - solve(active_constraint_set); + lmm_solve(active_constraint_set); XBT_OUT(); } } -template void System::solve(CnstList& cnst_list) +template void System::lmm_solve(CnstList& cnst_list) { double min_usage = -1; double min_bound = -1; @@ -677,7 +667,7 @@ template void System::solve(CnstList& cnst_list) } while (cnst_light_num > 0); - modified = false; + modified_ = false; if (selective_update_active) remove_all_modified_set(); @@ -690,11 +680,6 @@ template void System::solve(CnstList& cnst_list) delete[] cnst_light_tab; } -void lmm_solve(System* sys) -{ - sys->solve(); -} - /** \brief Attribute the value bound to var->bound. * * \param var the Variable* @@ -705,7 +690,7 @@ void lmm_solve(System* sys) */ void System::update_variable_bound(Variable* var, double bound) { - modified = true; + modified_ = true; var->bound = bound; if (not var->cnsts.empty()) @@ -726,9 +711,6 @@ void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sh visited = visited_value; mu = 0.0; new_mu = 0.0; - func_f = func_f_def; - func_fp = func_fp_def; - func_fpi = func_fpi_def; xbt_assert(not variable_set_hook.is_linked()); xbt_assert(not saturated_variable_set_hook.is_linked()); @@ -864,7 +846,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) { @@ -892,7 +874,7 @@ 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; } @@ -910,7 +892,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); @@ -918,7 +900,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_; } } @@ -938,7 +920,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;