Add new entry in Release_Notes.

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

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index e19ef33..3349fc5 100644 (file)
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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 "src/surf/surf_interface.hpp"
+#include "src/kernel/lmm/fair_bottleneck.hpp"
+#include "src/simgrid/math_utils.h"
 #include "xbt/sysdep.h"
 
 #include <algorithm>
@@ -13,18 +13,10 @@
 #include <cstdlib>
 #include <xbt/utility.hpp>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_lmm);
 
-simgrid::kernel::lmm::System* simgrid::kernel::lmm::make_new_fair_bottleneck_system(bool selective_update)
+void simgrid::kernel::lmm::FairBottleneck::do_solve()
 {
-  return new simgrid::kernel::lmm::FairBottleneck(selective_update);
-}
-
-void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
-{
-  if (not modified_)
-    return;
-
   XBT_DEBUG("Variable set : %zu", variable_set.size());
   for (Variable& var : variable_set) {
     var.value_ = 0.0;
@@ -41,9 +33,8 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
   }
 
   XBT_DEBUG("Active constraints : %zu", active_constraint_set.size());
-  for (Constraint& cnst : active_constraint_set) {
-    saturated_constraint_set.push_back(cnst);
-  }
+  saturated_constraint_set.insert(saturated_constraint_set.end(), active_constraint_set.begin(),
+                                  active_constraint_set.end());
   for (Constraint& cnst : saturated_constraint_set) {
     cnst.remaining_ = cnst.bound_;
     cnst.usage_     = 0.0;
@@ -57,7 +48,7 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
   auto& var_list  = saturated_variable_set;
   auto& cnst_list = saturated_constraint_set;
   do {
-    if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
+    if (XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug)) {
       XBT_DEBUG("Fair bottleneck done");
       print();
     }
@@ -73,7 +64,7 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
           nb++;
       }
       XBT_DEBUG("\tThere are %d variables", nb);
-      if (nb > 0 && cnst.sharing_policy_ == s4u::Link::SharingPolicy::FATPIPE)
+      if (nb > 0 && cnst.sharing_policy_ == Constraint::SharingPolicy::FATPIPE)
         nb = 1;
       if (nb == 0) {
         cnst.remaining_ = 0.0;
@@ -107,12 +98,12 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
       Constraint& cnst = *iter;
       XBT_DEBUG("Updating cnst %p ", &cnst);
-      if (cnst.sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE) {
+      if (cnst.sharing_policy_ != Constraint::SharingPolicy::FATPIPE) {
         for (const Element& elem : cnst.enabled_element_set_) {
           xbt_assert(elem.variable->sharing_penalty_ > 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);
+          double_update(&cnst.remaining_, elem.consumption_weight * elem.variable->mu_, sg_precision_workamount);
         }
       } else {
         for (const Element& elem : cnst.enabled_element_set_) {
@@ -122,7 +113,7 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
           cnst.usage_ = std::min(cnst.usage_, elem.consumption_weight * elem.variable->mu_);
         }
         XBT_DEBUG("\tUpdate constraint %p (%g) by %g", &cnst, cnst.remaining_, cnst.usage_);
-        double_update(&cnst.remaining_, cnst.usage_, sg_maxmin_precision);
+        double_update(&cnst.remaining_, cnst.usage_, sg_precision_workamount);
       }
 
       XBT_DEBUG("\tRemaining for %p : %g", &cnst, cnst.remaining_);
@@ -145,9 +136,4 @@ void simgrid::kernel::lmm::FairBottleneck::bottleneck_solve()
   } while (not var_list.empty());
 
   cnst_list.clear();
-  modified_ = true;
-  if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
-    XBT_DEBUG("Fair bottleneck done");
-    print();
-  }
 }