Reduce scope for variables.

[simgrid.git] / src / kernel / lmm / maxmin.cpp

diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 3dd1bb6..793c0f7 100644 (file)
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
 
 #include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/backtrace.hpp"
+#include <boost/core/demangle.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
 
@@ -16,16 +16,11 @@ namespace simgrid {
 namespace kernel {
 namespace lmm {
 
-typedef std::vector<int> dyn_light_t;
+using dyn_light_t = std::vector<int>;
 
 int Variable::next_rank_   = 1;
 int Constraint::next_rank_ = 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)
@@ -141,25 +136,21 @@ System::System(bool selective_update) : selective_update_active(selective_update
   XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
 
   if (selective_update)
-    modified_set_ = new kernel::resource::Action::ModifiedSet();
+    modified_set_ = std::make_unique<kernel::resource::Action::ModifiedSet>();
 }
 
 System::~System()
 {
-  Variable* var;
-  Constraint* cnst;
-
-  while ((var = extract_variable())) {
-    auto demangled = simgrid::xbt::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
-    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.get(),
+  while (Variable* var = extract_variable()) {
+    std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
+    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
              var->rank_);
     var_free(var);
   }
-  while ((cnst = extract_constraint()))
+  while (Constraint* cnst = extract_constraint())
     cnst_free(cnst);
 
   xbt_mallocator_free(variable_mallocator_);
-  delete modified_set_;
 }
 
 void System::cnst_free(Constraint* cnst)
@@ -175,7 +166,7 @@ Constraint::Constraint(resource::Resource* id_value, double bound_value) : bound
 
 Constraint* System::constraint_new(resource::Resource* id, double bound_value)
 {
-  Constraint* cnst = new Constraint(id, bound_value);
+  auto* cnst = new Constraint(id, bound_value);
   insert_constraint(cnst);
   return cnst;
 }
@@ -195,7 +186,7 @@ Variable* System::variable_new(resource::Action* id, double sharing_penalty, dou
   XBT_IN("(sys=%p, id=%p, penalty=%f, bound=%f, num_cons =%zu)", this, id, sharing_penalty, bound,
          number_of_constraints);
 
-  Variable* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
+  auto* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
   var->initialize(id, sharing_penalty, bound, number_of_constraints, visited_counter_ - 1);
   if (sharing_penalty > 0)
     variable_set.push_front(*var);
@@ -214,8 +205,7 @@ void System::variable_free(Variable* var)
 
 void System::variable_free_all()
 {
-  Variable* var;
-  while ((var = extract_variable()))
+  while (Variable* var = extract_variable())
     variable_free(var);
 }
 
@@ -428,7 +418,7 @@ static void format_element_list(const ElemList& elem_list, s4u::Link::SharingPol
 
 void System::print() const
 {
-  std::string buf = std::string("MAX-MIN ( ");
+  std::string buf = "MAX-MIN ( ";
 
   /* Printing Objective */
   for (Variable const& var : variable_set)
@@ -645,8 +635,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
     min_usage = -1;
     min_bound = -1;
     saturated_constraints.clear();
-    int pos;
-    for (pos = 0; pos < cnst_light_num; pos++) {
+    for (int pos = 0; pos < cnst_light_num; pos++) {
       xbt_assert(not cnst_light_tab[pos].cnst->active_element_set_.empty(),
                  "Cannot saturate more a constraint that has"
                  " no active element! You may want to change the maxmin precision (--cfg=maxmin/precision:<new_value>)"