From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 30 Nov 2017 20:43:14 +0000 (+0100)
Subject: Use boost::intrusive::list instead of swags of s_lmm_variable_t.
X-Git-Tag: v3.18~197^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e902ba6f18c458c914be7fda34595958d837e762

Use boost::intrusive::list instead of swags of s_lmm_variable_t.
---

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index 88c0625603..7cf24affb2 100644
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -19,35 +19,27 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
 
 void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
 {
-  void* _var;
-  void* _var_next;
   void* _elem;
-  lmm_variable_t var    = nullptr;
   lmm_element_t elem   = nullptr;
-  xbt_swag_t var_list  = nullptr;
   xbt_swag_t elem_list = nullptr;
 
   if (not sys->modified)
     return;
 
-  var_list = &(sys->variable_set);
-  XBT_DEBUG("Variable set : %d", xbt_swag_size(var_list));
-  xbt_swag_foreach(_var, var_list)
-  {
-    var        = static_cast<lmm_variable_t>(_var);
-    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) {
-                                       return x.consumption_weight != 0.0;
-                                     }) != end(var->cnsts)) {
-      xbt_swag_insert(var, &(sys->saturated_variable_set));
+  XBT_DEBUG("Variable set : %zu", sys->variable_set.size());
+  for (s_lmm_variable_t& var : sys->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) {
+                                      return x.consumption_weight != 0.0;
+                                    }) != end(var.cnsts)) {
+      sys->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)
-        var->value = 1.0;
+      XBT_DEBUG("Err, finally, there is no need to take care of variable %p", &var);
+      if (var.sharing_weight > 0.0)
+        var.value = 1.0;
     }
   }
-  var_list = &(sys->saturated_variable_set);
 
   XBT_DEBUG("Active constraints : %zu", sys->active_constraint_set.size());
   for (s_lmm_constraint_t& cnst : sys->active_constraint_set) {
@@ -63,6 +55,7 @@ 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;
   do {
     if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
@@ -80,7 +73,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
       {
         elem = static_cast<lmm_element_t>(_elem);
         xbt_assert(elem->variable->sharing_weight > 0);
-        if ((elem->consumption_weight > 0) && xbt_swag_belongs(elem->variable, var_list))
+        if (elem->consumption_weight > 0 && elem->variable->saturated_variable_set_hook.is_linked())
           nb++;
       }
       XBT_DEBUG("\tThere are %d variables", nb);
@@ -97,22 +90,22 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
       }
     }
 
-    xbt_swag_foreach_safe(_var, _var_next, var_list)
-    {
-      var            = static_cast<lmm_variable_t>(_var);
+    for (auto iter = std::begin(var_list); iter != std::end(var_list);) {
+      s_lmm_variable_t& var = *iter;
       double min_inc = DBL_MAX;
-      for (s_lmm_element_t const& elm : var->cnsts) {
+      for (s_lmm_element_t const& elm : var.cnsts) {
         if (elm.consumption_weight > 0)
           min_inc = std::min(min_inc, elm.constraint->usage / elm.consumption_weight);
       }
-      if (var->bound > 0)
-        min_inc = std::min(min_inc, var->bound - var->value);
-      var->mu   = min_inc;
-      XBT_DEBUG("Updating variable %p maximum increment: %g", var, var->mu);
-      var->value += var->mu;
-      if (var->value == var->bound) {
-        xbt_swag_remove(var, var_list);
-      }
+      if (var.bound > 0)
+        min_inc = std::min(min_inc, var.bound - var.value);
+      var.mu    = min_inc;
+      XBT_DEBUG("Updating variable %p maximum increment: %g", &var, var.mu);
+      var.value += var.mu;
+      if (var.value == var.bound)
+        iter = var_list.erase(iter);
+      else
+        iter++;
     }
 
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
@@ -149,16 +142,16 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
           elem = static_cast<lmm_element_t>(_elem);
           if (elem->variable->sharing_weight <= 0)
             break;
-          if (elem->consumption_weight > 0) {
+          if (elem->consumption_weight > 0 && elem->variable->saturated_variable_set_hook.is_linked()) {
             XBT_DEBUG("\t\tGet rid of variable %p", elem->variable);
-            xbt_swag_remove(elem->variable, var_list);
+            var_list.erase(var_list.iterator_to(*elem->variable));
           }
         }
       } else {
         iter++;
       }
     }
-  } while (xbt_swag_size(var_list));
+  } while (not var_list.empty());
 
   cnst_list.clear();
   sys->modified = true;
diff --git a/src/kernel/lmm/lagrange.cpp b/src/kernel/lmm/lagrange.cpp
index b68b4447a9..e1823db508 100644
--- a/src/kernel/lmm/lagrange.cpp
+++ b/src/kernel/lmm/lagrange.cpp
@@ -44,14 +44,12 @@ static double dichotomy(double init, double diff(double, const s_lmm_constraint_
 // computes the value of the differential of constraint cnst applied to lambda
 static double partial_diff_lambda(double lambda, const s_lmm_constraint_t& cnst);
 
-template <class CnstList>
-static int __check_feasible(const CnstList& cnst_list, xbt_swag_t var_list, int warn)
+template <class CnstList, class VarList>
+static int __check_feasible(const CnstList& cnst_list, const VarList& var_list, int warn)
 {
   void* _elem;
-  void* _var;
   const_xbt_swag_t elem_list = nullptr;
   lmm_element_t elem    = nullptr;
-  lmm_variable_t var    = nullptr;
 
   for (s_lmm_constraint_t const& cnst : cnst_list) {
     double tmp = 0;
@@ -59,7 +57,7 @@ static int __check_feasible(const CnstList& cnst_list, xbt_swag_t var_list, int
     xbt_swag_foreach(_elem, elem_list)
     {
       elem = static_cast<lmm_element_t>(_elem);
-      var  = elem->variable;
+      lmm_variable_t var = elem->variable;
       xbt_assert(var->sharing_weight > 0);
       tmp += var->value;
     }
@@ -72,18 +70,16 @@ static int __check_feasible(const CnstList& cnst_list, xbt_swag_t var_list, int
     XBT_DEBUG("Checking feasability for constraint (%p): sat = %f, lambda = %f ", &cnst, tmp - cnst.bound, cnst.lambda);
   }
 
-  xbt_swag_foreach(_var, var_list)
-  {
-    var = static_cast<lmm_variable_t>(_var);
-    if (not var->sharing_weight)
+  for (s_lmm_variable_t const& var : var_list) {
+    if (not var.sharing_weight)
       break;
-    if (var->bound < 0)
+    if (var.bound < 0)
       continue;
-    XBT_DEBUG("Checking feasability for variable (%p): sat = %f mu = %f", var, var->value - var->bound, var->mu);
+    XBT_DEBUG("Checking feasability for variable (%p): sat = %f mu = %f", &var, var.value - var.bound, var.mu);
 
-    if (double_positive(var->value - var->bound, sg_maxmin_precision)) {
+    if (double_positive(var.value - var.bound, sg_maxmin_precision)) {
       if (warn)
-        XBT_WARN("The variable (%p) is too large. Expected less than %f and got %f", var, var->bound, var->value);
+        XBT_WARN("The variable (%p) is too large. Expected less than %f and got %f", &var, var.bound, var.value);
       return 0;
     }
   }
@@ -118,34 +114,29 @@ static double new_mu(const s_lmm_variable_t& var)
   return mu_i;
 }
 
-template <class CnstList>
-static double dual_objective(xbt_swag_t var_list, const CnstList& cnst_list)
+template <class VarList, class CnstList>
+static double dual_objective(const VarList& var_list, const CnstList& cnst_list)
 {
-  void* _var;
-  lmm_variable_t var    = nullptr;
-
   double obj = 0.0;
 
-  xbt_swag_foreach(_var, var_list)
-  {
-    var            = static_cast<lmm_variable_t>(_var);
+  for (s_lmm_variable_t const& var : var_list) {
     double sigma_i = 0.0;
 
-    if (not var->sharing_weight)
+    if (not var.sharing_weight)
       break;
 
-    for (s_lmm_element_t const& elem : var->cnsts)
+    for (s_lmm_element_t const& elem : var.cnsts)
       sigma_i += elem.constraint->lambda;
 
-    if (var->bound > 0)
-      sigma_i += var->mu;
+    if (var.bound > 0)
+      sigma_i += var.mu;
 
-    XBT_DEBUG("var %p : sigma_i = %1.20f", var, sigma_i);
+    XBT_DEBUG("var %p : sigma_i = %1.20f", &var, sigma_i);
 
-    obj += var->func_f(*var, var->func_fpi(*var, sigma_i)) - sigma_i * var->func_fpi(*var, sigma_i);
+    obj += var.func_f(var, var.func_fpi(var, sigma_i)) - sigma_i * var.func_fpi(var, sigma_i);
 
-    if (var->bound > 0)
-      obj += var->mu * var->bound;
+    if (var.bound > 0)
+      obj += var.mu * var.bound;
   }
 
   for (s_lmm_constraint_t const& cnst : cnst_list)
@@ -187,30 +178,27 @@ void lagrange_solve(lmm_system_t sys)
    * Initialize the var list variable with only the active variables.
    * Associate an index in the swag variables. Initialize mu.
    */
-  xbt_swag_t var_list = &(sys->variable_set);
-  void* _var;
-  xbt_swag_foreach(_var, var_list)
-  {
-    lmm_variable_t var = static_cast<lmm_variable_t>(_var);
-    if (not var->sharing_weight)
-      var->value = 0.0;
+  auto& var_list = sys->variable_set;
+  for (s_lmm_variable_t& var : var_list) {
+    if (not var.sharing_weight)
+      var.value = 0.0;
     else {
-      if (var->bound < 0.0) {
-        XBT_DEBUG("#### NOTE var(%p) is a boundless variable", var);
-        var->mu = -1.0;
+      if (var.bound < 0.0) {
+        XBT_DEBUG("#### NOTE var(%p) is a boundless variable", &var);
+        var.mu = -1.0;
       } else {
-        var->mu     = 1.0;
-        var->new_mu = 2.0;
+        var.mu     = 1.0;
+        var.new_mu = 2.0;
       }
-      var->value = new_value(*var);
-      XBT_DEBUG("#### var(%p) ->weight :  %e", var, var->sharing_weight);
-      XBT_DEBUG("#### var(%p) ->mu :  %e", var, var->mu);
-      XBT_DEBUG("#### var(%p) ->weight: %e", var, var->sharing_weight);
-      XBT_DEBUG("#### var(%p) ->bound: %e", var, var->bound);
-      auto weighted = std::find_if(begin(var->cnsts), end(var->cnsts),
+      var.value = new_value(var);
+      XBT_DEBUG("#### var(%p) ->weight :  %e", &var, var.sharing_weight);
+      XBT_DEBUG("#### var(%p) ->mu :  %e", &var, var.mu);
+      XBT_DEBUG("#### var(%p) ->weight: %e", &var, var.sharing_weight);
+      XBT_DEBUG("#### var(%p) ->bound: %e", &var, var.bound);
+      auto weighted = std::find_if(begin(var.cnsts), end(var.cnsts),
                                    [](s_lmm_element_t const& x) { return x.consumption_weight != 0.0; });
-      if (weighted == end(var->cnsts))
-        var->value = 1.0;
+      if (weighted == end(var.cnsts))
+        var.value = 1.0;
     }
   }
 
@@ -225,14 +213,12 @@ void lagrange_solve(lmm_system_t sys)
     XBT_DEBUG("-------------- Gradient Descent ----------");
 
     /* Improve the value of mu_i */
-    xbt_swag_foreach(_var, var_list)
-    {
-      lmm_variable_t var = static_cast<lmm_variable_t>(_var);
-      if (var->sharing_weight && var->bound >= 0) {
-        XBT_DEBUG("Working on var (%p)", var);
-        var->new_mu = new_mu(*var);
-        XBT_DEBUG("Updating mu : var->mu (%p) : %1.20f -> %1.20f", var, var->mu, var->new_mu);
-        var->mu = var->new_mu;
+    for (s_lmm_variable_t& var : var_list) {
+      if (var.sharing_weight && var.bound >= 0) {
+        XBT_DEBUG("Working on var (%p)", &var);
+        var.new_mu = new_mu(var);
+        XBT_DEBUG("Updating mu : var->mu (%p) : %1.20f -> %1.20f", &var, var.mu, var.new_mu);
+        var.mu = var.new_mu;
 
         double new_obj = dual_objective(var_list, cnst_list);
         XBT_DEBUG("Improvement for Objective (%g -> %g) : %g", obj, new_obj, obj - new_obj);
@@ -257,18 +243,16 @@ void lagrange_solve(lmm_system_t sys)
     /* Now computes the values of each variable (\rho) based on the values of \lambda and \mu. */
     XBT_DEBUG("-------------- Check convergence ----------");
     overall_modification = 0;
-    xbt_swag_foreach(_var, var_list)
-    {
-      lmm_variable_t var = static_cast<lmm_variable_t>(_var);
-      if (var->sharing_weight <= 0)
-        var->value = 0.0;
+    for (s_lmm_variable_t& var : var_list) {
+      if (var.sharing_weight <= 0)
+        var.value = 0.0;
       else {
-        double tmp = new_value(*var);
+        double tmp = new_value(var);
 
-        overall_modification = std::max(overall_modification, fabs(var->value - tmp));
+        overall_modification = std::max(overall_modification, fabs(var.value - tmp));
 
-        var->value = tmp;
-        XBT_DEBUG("New value of var (%p)  = %e, overall_modification = %e", var, var->value, overall_modification);
+        var.value = tmp;
+        XBT_DEBUG("New value of var (%p)  = %e, overall_modification = %e", &var, var.value, overall_modification);
       }
     }
 
@@ -417,25 +401,25 @@ static double partial_diff_lambda(double lambda, const s_lmm_constraint_t& cnst)
   xbt_swag_foreach(_elem, elem_list)
   {
     lmm_element_t elem = static_cast<lmm_element_t>(_elem);
-    lmm_variable_t var = elem->variable;
-    xbt_assert(var->sharing_weight > 0);
-    XBT_CDEBUG(surf_lagrange_dichotomy, "Computing sigma_i for var (%p)", var);
+    s_lmm_variable_t& var = *elem->variable;
+    xbt_assert(var.sharing_weight > 0);
+    XBT_CDEBUG(surf_lagrange_dichotomy, "Computing sigma_i for var (%p)", &var);
     // Initialize the summation variable
     double sigma_i = 0.0;
 
     // Compute sigma_i
-    for (s_lmm_element_t const& elem : var->cnsts) {
+    for (s_lmm_element_t const& elem : var.cnsts) {
       sigma_i += elem.constraint->lambda;
     }
 
     // add mu_i if this flow has a RTT constraint associated
-    if (var->bound > 0)
-      sigma_i += var->mu;
+    if (var.bound > 0)
+      sigma_i += var.mu;
 
     // replace value of cnst.lambda by the value of parameter lambda
     sigma_i = (sigma_i - cnst.lambda) + lambda;
 
-    diff += -var->func_fpi(*var, sigma_i);
+    diff += -var.func_fpi(var, sigma_i);
   }
 
   diff += cnst.bound;
diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index a50629930a..c66883e4a8 100644
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -93,20 +93,16 @@ void s_lmm_system_t::check_concurrency() const
   }
 
   // Check that for each variable, all corresponding elements are in the same state (i.e. same element sets)
-  void* varIt;
-  xbt_swag_foreach(varIt, &variable_set)
-  {
-    lmm_variable_t var = (lmm_variable_t)varIt;
-
-    if (var->cnsts.empty())
+  for (s_lmm_variable_t const& var : variable_set) {
+    if (var.cnsts.empty())
       continue;
 
-    lmm_element_t elem     = &var->cnsts[0];
+    const s_lmm_element_t* elem = &var.cnsts[0];
     int belong_to_enabled  = xbt_swag_belongs(elem, &(elem->constraint->enabled_element_set));
     int belong_to_disabled = xbt_swag_belongs(elem, &(elem->constraint->disabled_element_set));
     int belong_to_active   = xbt_swag_belongs(elem, &(elem->constraint->active_element_set));
 
-    for (s_lmm_element_t const& elem : var->cnsts) {
+    for (s_lmm_element_t const& elem : var.cnsts) {
       xbt_assert(belong_to_enabled == xbt_swag_belongs(&elem, &(elem.constraint->enabled_element_set)),
                  "Variable inconsistency (1): enabled_element_set");
       xbt_assert(belong_to_disabled == xbt_swag_belongs(&elem, &(elem.constraint->disabled_element_set)),
@@ -159,9 +155,6 @@ s_lmm_system_t::s_lmm_system_t(bool selective_update) : selective_update_active(
 
   XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
 
-  xbt_swag_init(&variable_set, xbt_swag_offset(var, variable_set_hookup));
-  xbt_swag_init(&saturated_variable_set, xbt_swag_offset(var, saturated_variable_set_hookup));
-
   keep_track          = nullptr;
   variable_mallocator = xbt_mallocator_new(65536, s_lmm_system_t::variable_mallocator_new_f,
                                            s_lmm_system_t::variable_mallocator_free_f, nullptr);
@@ -237,9 +230,9 @@ lmm_variable_t s_lmm_system_t::variable_new(simgrid::surf::Action* id, double sh
   lmm_variable_t var = static_cast<lmm_variable_t>(xbt_mallocator_get(variable_mallocator));
   var->initialize(id, sharing_weight, bound, number_of_constraints, visited_counter - 1);
   if (sharing_weight)
-    xbt_swag_insert_at_head(var, &variable_set);
+    variable_set.push_front(*var);
   else
-    xbt_swag_insert_at_tail(var, &variable_set);
+    variable_set.push_back(*var);
 
   XBT_OUT(" returns %p", var);
   return var;
@@ -427,8 +420,8 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t* cnst_
       lmm_element_t elem = (lmm_element_t)_elem;
       // Visiting active_element_set, so, by construction, should never get a zero weight, correct?
       xbt_assert(elem->variable->sharing_weight > 0);
-      if (elem->consumption_weight > 0)
-        xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+      if (elem->consumption_weight > 0 && not elem->variable->saturated_variable_set_hook.is_linked())
+        sys->saturated_variable_set.push_back(*elem->variable);
     }
   }
 }
@@ -451,15 +444,10 @@ static void format_lmm_element_swag(const_xbt_swag_t elem_list, int sharing_poli
 void s_lmm_system_t::print() const
 {
   std::string buf = std::string("MAX-MIN ( ");
-  void* _var;
 
   /* Printing Objective */
-  const_xbt_swag_t var_list = &variable_set;
-  xbt_swag_foreach(_var, var_list)
-  {
-    lmm_variable_t var = (lmm_variable_t)_var;
-    buf                = buf + "'" + std::to_string(var->id_int) + "'(" + std::to_string(var->sharing_weight) + ") ";
-  }
+  for (s_lmm_variable_t const& var : variable_set)
+    buf += "'" + std::to_string(var.id_int) + "'(" + std::to_string(var.sharing_weight) + ") ";
   buf += ")";
   XBT_DEBUG("%20s", buf.c_str());
   buf.clear();
@@ -488,15 +476,13 @@ void s_lmm_system_t::print() const
 
   XBT_DEBUG("Variables");
   /* Printing Result */
-  xbt_swag_foreach(_var, var_list)
-  {
-    lmm_variable_t var = (lmm_variable_t)_var;
-    if (var->bound > 0) {
-      XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->sharing_weight, var->value, var->bound);
-      xbt_assert(not double_positive(var->value - var->bound, var->bound * sg_maxmin_precision),
-                 "Incorrect value (%f is not smaller than %f", var->value, var->bound);
+  for (s_lmm_variable_t const& var : variable_set) {
+    if (var.bound > 0) {
+      XBT_DEBUG("'%d'(%f) : %f (<=%f)", var.id_int, var.sharing_weight, var.value, var.bound);
+      xbt_assert(not double_positive(var.value - var.bound, var.bound * sg_maxmin_precision),
+                 "Incorrect value (%f is not smaller than %f", var.value, var.bound);
     } else {
-      XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->sharing_weight, var->value);
+      XBT_DEBUG("'%d'(%f) : %f", var.id_int, var.sharing_weight, var.value);
     }
   }
 }
@@ -583,54 +569,51 @@ template <class CnstList> void s_lmm_system_t::solve(CnstList& cnst_list)
   /* Saturated variables update */
   do {
     /* Fix the variables that have to be */
-    xbt_swag_t var_list = &saturated_variable_set;
-    void* _var;
-    lmm_variable_t var = nullptr;
-    xbt_swag_foreach(_var, var_list)
-    {
-      var = (lmm_variable_t)_var;
-      if (var->sharing_weight <= 0.0)
+    auto& var_list = saturated_variable_set;
+    for (s_lmm_variable_t const& var : var_list) {
+      if (var.sharing_weight <= 0.0)
         DIE_IMPOSSIBLE;
       /* First check if some of these variables could reach their upper bound and update min_bound accordingly. */
-      XBT_DEBUG("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f", var->id_int,
-                var->bound, var->sharing_weight, min_usage, var->bound * var->sharing_weight);
-      if ((var->bound > 0) && (var->bound * var->sharing_weight < min_usage)) {
+      XBT_DEBUG("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f", var.id_int,
+                var.bound, var.sharing_weight, min_usage, var.bound * var.sharing_weight);
+      if ((var.bound > 0) && (var.bound * var.sharing_weight < min_usage)) {
         if (min_bound < 0)
-          min_bound = var->bound * var->sharing_weight;
+          min_bound = var.bound * var.sharing_weight;
         else
-          min_bound = std::min(min_bound, (var->bound * var->sharing_weight));
+          min_bound = std::min(min_bound, (var.bound * var.sharing_weight));
         XBT_DEBUG("Updated min_bound=%f", min_bound);
       }
     }
 
-    while ((var = (lmm_variable_t)xbt_swag_getFirst(var_list))) {
+    while (not var_list.empty()) {
+      s_lmm_variable_t& var = var_list.front();
       if (min_bound < 0) {
         // If no variable could reach its bound, deal iteratively the constraints usage ( at worst one constraint is
         // saturated at each cycle)
-        var->value = min_usage / var->sharing_weight;
-        XBT_DEBUG("Setting var (%d) value to %f\n", var->id_int, var->value);
+        var.value = min_usage / var.sharing_weight;
+        XBT_DEBUG("Setting var (%d) value to %f\n", var.id_int, var.value);
       } else {
         // If there exist a variable that can reach its bound, only update it (and other with the same bound) for now.
-        if (double_equals(min_bound, var->bound * var->sharing_weight, sg_maxmin_precision)) {
-          var->value = var->bound;
-          XBT_DEBUG("Setting %p (%d) value to %f\n", var, var->id_int, var->value);
+        if (double_equals(min_bound, var.bound * var.sharing_weight, sg_maxmin_precision)) {
+          var.value = var.bound;
+          XBT_DEBUG("Setting %p (%d) value to %f\n", &var, var.id_int, var.value);
         } else {
           // Variables which bound is different are not considered for this cycle, but they will be afterwards.
-          XBT_DEBUG("Do not consider %p (%d) \n", var, var->id_int);
-          xbt_swag_remove(var, var_list);
+          XBT_DEBUG("Do not consider %p (%d) \n", &var, var.id_int);
+          var_list.pop_front();
           continue;
         }
       }
-      XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ", min_usage, var->id_int, var->sharing_weight,
-                var->id_int, var->value);
+      XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ", min_usage, var.id_int, var.sharing_weight,
+                var.id_int, var.value);
 
       /* Update the usage of contraints where this variable is involved */
-      for (s_lmm_element_t& elem : var->cnsts) {
+      for (s_lmm_element_t& elem : var.cnsts) {
         lmm_constraint_t cnst = elem.constraint;
         if (cnst->sharing_policy) {
-          // 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);
+          // 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);
           // If the constraint is saturated, remove it from the set of active constraints (light_tab)
           if (not double_positive(cnst->usage, sg_maxmin_precision) ||
               not double_positive(cnst->remaining, cnst->bound * sg_maxmin_precision)) {
@@ -648,7 +631,7 @@ template <class CnstList> void s_lmm_system_t::solve(CnstList& cnst_list)
           }
           elem.make_inactive();
         } else {
-          // Remember: non-shared constraints only require that max(elem.value * var->value) < cnst->bound
+          // Remember: non-shared constraints only require that max(elem.value * var.value) < cnst->bound
           cnst->usage = 0.0;
           elem.make_inactive();
           xbt_swag_t elem_list = &(cnst->enabled_element_set);
@@ -683,7 +666,7 @@ template <class CnstList> void s_lmm_system_t::solve(CnstList& cnst_list)
           }
         }
       }
-      xbt_swag_remove(var, var_list);
+      var_list.pop_front();
     }
 
     /* Find out which variables reach the maximum */
@@ -759,10 +742,8 @@ void s_lmm_variable_t::initialize(simgrid::surf::Action* id_value, double sharin
   func_fp           = func_fp_def;
   func_fpi          = func_fpi_def;
 
-  variable_set_hookup.next           = nullptr;
-  variable_set_hookup.prev           = nullptr;
-  saturated_variable_set_hookup.next = nullptr;
-  saturated_variable_set_hookup.prev = nullptr;
+  xbt_assert(not variable_set_hook.is_linked());
+  xbt_assert(not saturated_variable_set_hook.is_linked());
 }
 
 int s_lmm_variable_t::get_min_concurrency_slack() const
@@ -791,11 +772,11 @@ void s_lmm_system_t::enable_var(lmm_variable_t var)
   var->sharing_weight = var->staged_weight;
   var->staged_weight  = 0;
 
-  // Enabling the variable, move to var to list head. Subtlety is: here, we need to call update_modified_set AFTER
+  // Enabling the variable, move var to list head. Subtlety is: here, we need to call update_modified_set AFTER
   // moving at least one element of var.
 
-  xbt_swag_remove(var, &variable_set);
-  xbt_swag_insert_at_head(var, &variable_set);
+  variable_set.erase(variable_set.iterator_to(*var));
+  variable_set.push_front(*var);
   for (s_lmm_element_t& elem : var->cnsts) {
     xbt_swag_remove(&elem, &(elem.constraint->disabled_element_set));
     xbt_swag_insert_at_head(&elem, &(elem.constraint->enabled_element_set));
@@ -814,8 +795,8 @@ void s_lmm_system_t::disable_var(lmm_variable_t var)
   xbt_assert(not var->staged_weight, "Staged weight should have been cleared");
   // Disabling the variable, move to var to list tail. Subtlety is: here, we need to call update_modified_set
   // BEFORE moving the last element of var.
-  xbt_swag_remove(var, &variable_set);
-  xbt_swag_insert_at_tail(var, &variable_set);
+  variable_set.erase(variable_set.iterator_to(*var));
+  variable_set.push_back(*var);
   if (not var->cnsts.empty())
     update_modified_set(var->cnsts[0].constraint);
   for (s_lmm_element_t& elem : var->cnsts) {
@@ -970,8 +951,8 @@ void s_lmm_system_t::remove_all_modified_set()
   // (i.e. not readibily reproducible, and requiring a lot of run time before happening).
   if (++visited_counter == 1) {
     /* the counter wrapped around, reset each variable->visited */
-    void* _var;
-    xbt_swag_foreach(_var, &variable_set)((lmm_variable_t)_var)->visited = 0;
+    for (s_lmm_variable_t& var : variable_set)
+      var.visited = 0;
   }
   modified_constraint_set.clear();
 }
diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp
index 7dc3da7dc3..7ab4563e42 100644
--- a/src/kernel/lmm/maxmin.hpp
+++ b/src/kernel/lmm/maxmin.hpp
@@ -392,8 +392,8 @@ public:
   int can_enable() const { return staged_weight > 0 && get_min_concurrency_slack() >= concurrency_share; }
 
   /* hookup to system */
-  s_xbt_swag_hookup_t variable_set_hookup           = {nullptr, nullptr};
-  s_xbt_swag_hookup_t saturated_variable_set_hookup = {nullptr, nullptr};
+  boost::intrusive::list_member_hook<> variable_set_hook;
+  boost::intrusive::list_member_hook<> saturated_variable_set_hook;
 
   std::vector<s_lmm_element_t> cnsts;
 
@@ -524,7 +524,14 @@ private:
 
   void var_free(lmm_variable_t var);
   void cnst_free(lmm_constraint_t cnst);
-  lmm_variable_t extract_variable() { return static_cast<lmm_variable_t>(xbt_swag_extract(&variable_set)); }
+  lmm_variable_t extract_variable()
+  {
+    if (variable_set.empty())
+      return nullptr;
+    lmm_variable_t res = &variable_set.front();
+    variable_set.pop_front();
+    return res;
+  }
   lmm_constraint_t extract_constraint()
   {
     if (constraint_set.empty())
@@ -536,8 +543,10 @@ private:
   void insert_constraint(lmm_constraint_t cnst) { constraint_set.push_back(*cnst); }
   void remove_variable(lmm_variable_t var)
   {
-    xbt_swag_remove(var, &variable_set);
-    xbt_swag_remove(var, &saturated_variable_set);
+    if (var->variable_set_hook.is_linked())
+      variable_set.erase(variable_set.iterator_to(*var));
+    if (var->saturated_variable_set_hook.is_linked())
+      saturated_variable_set.erase(saturated_variable_set.iterator_to(*var));
   }
   void make_constraint_active(lmm_constraint_t cnst)
   {
@@ -574,12 +583,18 @@ private:
   template <class CnstList> void solve(CnstList& cnst_list);
 public:
   bool modified;
-  s_xbt_swag_t variable_set;             /* a list of lmm_variable_t */
+  boost::intrusive::list<s_lmm_variable_t,
+                         boost::intrusive::member_hook<s_lmm_variable_t, boost::intrusive::list_member_hook<>,
+                                                       &s_lmm_variable_t::variable_set_hook>>
+      variable_set;
   boost::intrusive::list<s_lmm_constraint_t,
                          boost::intrusive::member_hook<s_lmm_constraint_t, boost::intrusive::list_member_hook<>,
                                                        &s_lmm_constraint_t::active_constraint_set_hook>>
       active_constraint_set;
-  s_xbt_swag_t saturated_variable_set;   /* a list of lmm_variable_t */
+  boost::intrusive::list<s_lmm_variable_t,
+                         boost::intrusive::member_hook<s_lmm_variable_t, boost::intrusive::list_member_hook<>,
+                                                       &s_lmm_variable_t::saturated_variable_set_hook>>
+      saturated_variable_set;
   boost::intrusive::list<s_lmm_constraint_t,
                          boost::intrusive::member_hook<s_lmm_constraint_t, boost::intrusive::list_member_hook<>,
                                                        &s_lmm_constraint_t::saturated_constraint_set_hook>>