X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/257fa70ab80653b27b12b27cadf82468f29f62e9..f1857a20fd06ac10cf352dd0d7757ce63882c015:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index 876d72d480..002b9c046c 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-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. */ @@ -33,6 +33,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 +117,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,21 +144,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); - keep_track = nullptr; - 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() @@ -170,7 +170,8 @@ System::~System() while ((cnst = extract_constraint())) cnst_free(cnst); - xbt_mallocator_free(variable_mallocator); + xbt_mallocator_free(variable_mallocator_); + delete modified_set_; } void System::cnst_free(Constraint* cnst) @@ -212,13 +213,13 @@ void System::variable_mallocator_free_f(void* var) delete static_cast(var); } -Variable* System::variable_new(simgrid::surf::Action* id, double sharing_weight, double bound, +Variable* System::variable_new(simgrid::kernel::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); - 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 +237,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 +290,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(); @@ -412,7 +413,7 @@ static inline void saturated_constraints_update(double usage, int cnst_light_num } static inline void saturated_variable_set_update(ConstraintLight* cnst_light_tab, - const dyn_light_t& saturated_constraints, lmm_system_t sys) + const dyn_light_t& saturated_constraints, System* sys) { /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate * (cnst_light_tab)*/ @@ -486,22 +487,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; @@ -535,9 +536,9 @@ template void System::solve(CnstList& cnst_list) cnst.usage = elem.consumption_weight / elem.variable->sharing_weight; elem.make_active(); - simgrid::surf::Action* action = static_cast(elem.variable->id); - if (keep_track && not action->isLinkedModifiedSet()) - keep_track->push_back(*action); + simgrid::kernel::resource::Action* action = static_cast(elem.variable->id); + if (modified_set_ && not action->is_within_modified_set()) + modified_set_->push_back(*action); } } XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst.id_int, cnst.usage, @@ -677,7 +678,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 +691,6 @@ template void System::solve(CnstList& cnst_list) delete[] cnst_light_tab; } -void lmm_solve(lmm_system_t sys) -{ - sys->solve(); -} - /** \brief Attribute the value bound to var->bound. * * \param var the Variable* @@ -705,14 +701,14 @@ void lmm_solve(lmm_system_t sys) */ 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::surf::Action* id_value, double sharing_weight_value, double bound_value, +void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value, int number_of_constraints, unsigned visited_value) { id = id_value; @@ -726,9 +722,6 @@ void Variable::initialize(simgrid::surf::Action* id_value, double sharing_weight 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()); @@ -817,12 +810,12 @@ void System::on_disabled_var(Constraint* cnstr) if (not numelem) return; - lmm_element_t elem = &cnstr->disabled_element_set.front(); + Element* elem = &cnstr->disabled_element_set.front(); // Cannot use foreach loop, because System::enable_var() will modify disabled_element_set.. within the loop while (numelem-- && elem) { - lmm_element_t nextelem; + Element* nextelem; if (elem->disabled_element_set_hook.is_linked()) { auto iter = std::next(cnstr->disabled_element_set.iterator_to(*elem)); nextelem = iter != std::end(cnstr->disabled_element_set) ? &*iter : nullptr; @@ -864,7 +857,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 +885,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 +903,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 +911,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 +931,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;