syntax issues

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

diff --git a/src/kernel/lmm/System.cpp b/src/kernel/lmm/System.cpp
index 7d80308..100917b 100644 (file)
--- a/src/kernel/lmm/System.cpp
+++ b/src/kernel/lmm/System.cpp
@@ -17,9 +17,7 @@ double sg_maxmin_precision = 1E-5; /* Change this with --cfg=maxmin/precision:VA
 double sg_surf_precision   = 1E-9; /* Change this with --cfg=surf/precision:VALUE */
 int sg_concurrency_limit   = -1;      /* Change this with --cfg=maxmin/concurrency-limit:VALUE */
 
-namespace simgrid {
-namespace kernel {
-namespace lmm {
+namespace simgrid::kernel::lmm {
 
 int Variable::next_rank_   = 1;
 int Constraint::next_rank_ = 1;
@@ -31,6 +29,11 @@ Element::Element(Constraint* constraint, Variable* variable, double cweight)
 
 int Element::get_concurrency() const
 {
+  // just to try having the computation of the concurrency
+  if (constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
+    return 1;
+  }
+
   // Ignore element with weight less than one (e.g. cross-traffic)
   return (consumption_weight >= 1) ? 1 : 0;
   // There are other alternatives, but they will change the behavior of the model..
@@ -176,9 +179,10 @@ System::System(bool selective_update) : selective_update_active(selective_update
 System::~System()
 {
   while (Variable* var = extract_variable()) {
-    std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
-    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
-             var->rank_);
+    const char* name = var->id_ ? typeid(*var->id_).name() : "(unidentified)";
+    boost::core::scoped_demangled_name demangled(name);
+    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.",
+             demangled.get() ? demangled.get() : name, var->rank_);
     var_free(var);
   }
   while (Constraint* cnst = extract_constraint())
@@ -317,8 +321,6 @@ Variable* Constraint::get_variable(const Element** elem) const
       *elem = &enabled_element_set_.front();
     else if (not disabled_element_set_.empty())
       *elem = &disabled_element_set_.front();
-    else
-      *elem = nullptr;
   } else {
     // elem is not null, so we carry on
     if ((*elem)->enabled_element_set_hook.is_linked()) {
@@ -351,8 +353,6 @@ Variable* Constraint::get_variable_safe(const Element** elem, const Element** ne
       *elem = &enabled_element_set_.front();
     else if (not disabled_element_set_.empty())
       *elem = &disabled_element_set_.front();
-    else
-      *elem = nullptr;
   } else {
     *elem = *nextelem;
     if (*numelem > 0) {
@@ -759,12 +759,10 @@ double Constraint::get_usage() const
 
 void Constraint::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb)
 {
-  xbt_assert(policy == SharingPolicy::NONLINEAR || not cb,
+  xbt_assert(policy == SharingPolicy::NONLINEAR || policy == SharingPolicy::WIFI || not cb,
              "Invalid sharing policy for constraint. Callback should be used with NONLINEAR sharing policy");
   sharing_policy_    = policy;
   dyn_constraint_cb_ = cb;
 }
 
-} // namespace lmm
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::lmm