X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02fbf5e463830a439464adae8626cd4f2dad27fd..265e908745398dd4e9cc55187aa267650468c57c:/src/kernel/lmm/fair_bottleneck.cpp

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index 5ff0ef272f..cd43352447 100644
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2011, 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */
@@ -11,22 +10,23 @@
 #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);
 #define SHOW_EXPR_D(expr) XBT_DEBUG(#expr " = %d", expr);
 #define SHOW_EXPR_P(expr) XBT_DEBUG(#expr " = %p", expr);
 
-void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
+void simgrid::kernel::lmm::bottleneck_solve(lmm::System* sys)
 {
   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) {
+    if (var.sharing_weight > 0.0 && std::find_if(begin(var.cnsts), end(var.cnsts), [](Element const& x) {
                                       return x.consumption_weight != 0.0;
                                     }) != end(var.cnsts)) {
       sys->saturated_variable_set.push_back(var);
@@ -38,10 +38,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;
   }
@@ -60,11 +60,11 @@ 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);
       cnst.usage = 0.0;
-      for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+      for (Element& 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++;
@@ -84,9 +84,9 @@ 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) {
+      for (Element const& elm : var.cnsts) {
         if (elm.consumption_weight > 0)
           min_inc = std::min(min_inc, elm.constraint->usage / elm.consumption_weight);
       }
@@ -102,17 +102,17 @@ 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);
       if (cnst.sharing_policy) {
-        for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+        for (Element& 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) {
+        for (Element& 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);
@@ -127,12 +127,12 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
         XBT_DEBUG("\tGet rid of constraint %p", &cnst);
 
         iter = cnst_list.erase(iter);
-        for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+        for (Element& 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));
+            simgrid::xbt::intrusive_erase(var_list, *elem.variable);
           }
         }
       } else {