CommWaitTransition mailbox is now valid

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

diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 80d051976579b46fdb75e9d863c11b9f0ed40aa6..485159d1d64513daae3cb4c0d4fe8e9e3dcf4a5a 100644 (file)
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2022. 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. */
@@ -7,7 +7,7 @@
 #include <boost/core/demangle.hpp>
 #include <typeinfo>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_lmm, kernel, "Kernel Linear Max-Min solver");
 
 double sg_maxmin_precision = 1E-5; /* Change this with --cfg=maxmin/precision:VALUE */
 double sg_surf_precision   = 1E-9; /* Change this with --cfg=surf/precision:VALUE */
@@ -55,7 +55,7 @@ void Element::increase_concurrency()
 void System::check_concurrency() const
 {
   // These checks are very expensive, so do them only if we want to debug SURF LMM
-  if (not XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug))
+  if (not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug))
     return;
 
   for (Constraint const& cnst : constraint_set) {
@@ -564,12 +564,12 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
           XBT_DEBUG("Setting %p (%d) value to %f\n", &var, var.rank_, 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.rank_);
+          XBT_DEBUG("Do not consider %p (%d)\n", &var, var.rank_);
           var_list.pop_front();
           continue;
         }
       }
-      XBT_DEBUG("Min usage: %f, Var(%d).penalty: %f, Var(%d).value: %f ", min_usage, var.rank_, var.sharing_penalty_,
+      XBT_DEBUG("Min usage: %f, Var(%d).penalty: %f, Var(%d).value: %f", min_usage, var.rank_, var.sharing_penalty_,
                 var.rank_, var.value_);
 
       /* Update the usage of constraints where this variable is involved */
@@ -585,7 +585,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
               not double_positive(cnst->remaining_, cnst->dynamic_bound_ * sg_maxmin_precision)) {
             if (cnst->cnst_light_) {
               size_t index = (cnst->cnst_light_ - cnst_light_tab);
-              XBT_DEBUG("index: %zu \t cnst_light_num: %d \t || usage: %f remaining: %f bound: %f  ", index,
+              XBT_DEBUG("index: %zu \t cnst_light_num: %d \t || usage: %f remaining: %f bound: %f", index,
                         cnst_light_num, cnst->usage_, cnst->remaining_, cnst->dynamic_bound_);
               cnst_light_tab[index]                  = cnst_light_tab[cnst_light_num - 1];
               cnst_light_tab[index].cnst->cnst_light_ = &cnst_light_tab[index];
@@ -615,7 +615,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
             if (cnst->cnst_light_) {
               size_t index = (cnst->cnst_light_ - cnst_light_tab);
               XBT_DEBUG("index: %zu \t cnst_light_num: %d \t || \t cnst: %p \t cnst->cnst_light: %p "
-                        "\t cnst_light_tab: %p usage: %f remaining: %f bound: %f  ",
+                        "\t cnst_light_tab: %p usage: %f remaining: %f bound: %f",
                         index, cnst_light_num, cnst, cnst->cnst_light_, cnst_light_tab, cnst->usage_, cnst->remaining_,
                         cnst->dynamic_bound_);
               cnst_light_tab[index]                  = cnst_light_tab[cnst_light_num - 1];
@@ -657,7 +657,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
   if (selective_update_active)
     remove_all_modified_set();
 
-  if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
+  if (XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug)) {
     print();
   }
 
@@ -720,7 +720,7 @@ int Variable::get_min_concurrency_slack() const
 // loops (after doing the first for enabling==1, and before doing the last for disabling==1)
 void System::enable_var(Variable* var)
 {
-  xbt_assert(not XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug) || var->can_enable());
+  xbt_assert(not XBT_LOG_ISENABLED(ker_lmm, xbt_log_priority_debug) || var->can_enable());
 
   var->sharing_penalty_ = var->staged_penalty_;
   var->staged_penalty_  = 0;
@@ -823,7 +823,7 @@ void System::update_variable_penalty(Variable* var, double penalty)
   bool enabling_var  = (penalty > 0 && var->sharing_penalty_ <= 0);
   bool disabling_var = (penalty <= 0 && var->sharing_penalty_ > 0);
 
-  XBT_IN("(sys=%p, var=%p, penalty=%f)", this, var, penalty);
+  XBT_IN("(sys=%p, var=%p, var->sharing_penalty = %f, penalty=%f)", this, var, var->sharing_penalty_, penalty);
 
   modified_ = true;
 
@@ -843,6 +843,8 @@ void System::update_variable_penalty(Variable* var, double penalty)
     disable_var(var);
   } else {
     var->sharing_penalty_ = penalty;
+    if (not var->cnsts_.empty())
+      update_modified_set(var->cnsts_[0].constraint);
   }
 
   check_concurrency();