X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e902ba6f18c458c914be7fda34595958d837e762..ca3f81bbdb29e514038a035ae1e3d222a5c7d6b5:/src/kernel/lmm/fair_bottleneck.cpp

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index 7cf24affb2..c368001621 100644
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -11,6 +11,7 @@
 #include <cfloat>
 #include <cmath>
 #include <cstdlib>
+#include <xbt/utility.hpp>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
 #define SHOW_EXPR_G(expr) XBT_DEBUG(#expr " = %g", expr);
@@ -19,15 +20,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
 
 void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
 {
-  void* _elem;
-  lmm_element_t elem   = nullptr;
-  xbt_swag_t elem_list = nullptr;
-
   if (not sys->modified)
     return;
 
   XBT_DEBUG("Variable set : %zu", sys->variable_set.size());
-  for (s_lmm_variable_t& var : sys->variable_set) {
+  for (Variable& 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) {
@@ -42,10 +39,10 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
   }
 
   XBT_DEBUG("Active constraints : %zu", sys->active_constraint_set.size());
-  for (s_lmm_constraint_t& cnst : sys->active_constraint_set) {
+  for (Constraint& cnst : sys->active_constraint_set) {
     sys->saturated_constraint_set.push_back(cnst);
   }
-  for (s_lmm_constraint_t& cnst : sys->saturated_constraint_set) {
+  for (Constraint& cnst : sys->saturated_constraint_set) {
     cnst.remaining = cnst.bound;
     cnst.usage     = 0.0;
   }
@@ -64,16 +61,13 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
     XBT_DEBUG("******* Constraints to process: %zu *******", cnst_list.size());
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
-      s_lmm_constraint_t& cnst = *iter;
+      Constraint& cnst = *iter;
       int nb = 0;
       XBT_DEBUG("Processing cnst %p ", &cnst);
-      elem_list  = &cnst.enabled_element_set;
       cnst.usage = 0.0;
-      xbt_swag_foreach(_elem, elem_list)
-      {
-        elem = static_cast<lmm_element_t>(_elem);
-        xbt_assert(elem->variable->sharing_weight > 0);
-        if (elem->consumption_weight > 0 && elem->variable->saturated_variable_set_hook.is_linked())
+      for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+        xbt_assert(elem.variable->sharing_weight > 0);
+        if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked())
           nb++;
       }
       XBT_DEBUG("\tThere are %d variables", nb);
@@ -91,7 +85,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
 
     for (auto iter = std::begin(var_list); iter != std::end(var_list);) {
-      s_lmm_variable_t& var = *iter;
+      Variable& var  = *iter;
       double min_inc = DBL_MAX;
       for (s_lmm_element_t const& elm : var.cnsts) {
         if (elm.consumption_weight > 0)
@@ -109,26 +103,23 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
 
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
-      s_lmm_constraint_t& cnst = *iter;
+      Constraint& cnst = *iter;
       XBT_DEBUG("Updating cnst %p ", &cnst);
-      elem_list = &cnst.enabled_element_set;
-      xbt_swag_foreach(_elem, elem_list)
-      {
-        elem = static_cast<lmm_element_t>(_elem);
-        xbt_assert(elem->variable->sharing_weight > 0);
-        if (cnst.sharing_policy) {
-          XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g", &cnst, cnst.remaining, elem->variable,
-                    elem->variable->mu);
-          double_update(&cnst.remaining, elem->consumption_weight * elem->variable->mu, sg_maxmin_precision);
-        } else {
+      if (cnst.sharing_policy) {
+        for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+          xbt_assert(elem.variable->sharing_weight > 0);
+          XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g", &cnst, cnst.remaining, elem.variable,
+                    elem.variable->mu);
+          double_update(&cnst.remaining, elem.consumption_weight * elem.variable->mu, sg_maxmin_precision);
+        }
+      } else {
+        for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+          xbt_assert(elem.variable->sharing_weight > 0);
           XBT_DEBUG("\tNon-Shared variable. Update constraint usage of %p (%g) with variable %p by %g", &cnst,
-                    cnst.usage, elem->variable, elem->variable->mu);
-          cnst.usage = std::min(cnst.usage, elem->consumption_weight * elem->variable->mu);
+                    cnst.usage, elem.variable, elem.variable->mu);
+          cnst.usage = std::min(cnst.usage, elem.consumption_weight * elem.variable->mu);
         }
-      }
-      if (not cnst.sharing_policy) {
         XBT_DEBUG("\tUpdate constraint %p (%g) by %g", &cnst, cnst.remaining, cnst.usage);
-
         double_update(&cnst.remaining, cnst.usage, sg_maxmin_precision);
       }
 
@@ -137,14 +128,12 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
         XBT_DEBUG("\tGet rid of constraint %p", &cnst);
 
         iter = cnst_list.erase(iter);
-        xbt_swag_foreach(_elem, elem_list)
-        {
-          elem = static_cast<lmm_element_t>(_elem);
-          if (elem->variable->sharing_weight <= 0)
+        for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+          if (elem.variable->sharing_weight <= 0)
             break;
-          if (elem->consumption_weight > 0 && elem->variable->saturated_variable_set_hook.is_linked()) {
-            XBT_DEBUG("\t\tGet rid of variable %p", elem->variable);
-            var_list.erase(var_list.iterator_to(*elem->variable));
+          if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked()) {
+            XBT_DEBUG("\t\tGet rid of variable %p", elem.variable);
+            simgrid::xbt::intrusive_erase(var_list, *elem.variable);
           }
         }
       } else {