Changeset 95:8c260716cbb4 in finroc_plugins_parameters

Timestamp:

25.03.2021 08:04:48 (3 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Children:

96:f998b50b4ea3, 97:2ad135631834

Phase:

public

Message:

Prevents recursive calls to components' 'OnStaticParameterChange' callback

File:

• internal/tStaticParameterList.cpp (modified) (2 diffs)

internal/tStaticParameterList.cpp

@@ -75 +75 @@
 // Implementation
 //----------------------------------------------------------------------
+
+namespace
+{
+
+std::vector<core::tFrameworkElement*>& ElementsInStaticParameterEvaluation()
+{
+  static std::vector<core::tFrameworkElement*> list;
+  return list;
+}
+
+}
+
 
 tStaticParameterList::tStaticParameterList() :
@@ -194 +206 @@
 {
   rrlib::thread::tLock lock2(fe.GetStructureMutex());
-
-  // all parameters attached to any of the module's parameters
-  std::vector<tStaticParameterImplementationBase*> attached_parameters;
-  std::vector<tStaticParameterImplementationBase*> attached_parameters_tmp;
-
-  tStaticParameterList* spl = fe.GetAnnotation<tStaticParameterList>();
-  if (spl)
-  {
-
-    // Reevaluate parameters and check whether they have changed
-    bool changed = false;
-    for (size_t i = 0; i < spl->Size(); i++)
-    {
-      spl->Get(i).LoadValue();
-      changed |= spl->Get(i).HasChanged();
-      spl->Get(i).GetAllAttachedParameters(attached_parameters_tmp);
-      attached_parameters.insert(attached_parameters.end(), attached_parameters_tmp.begin(), attached_parameters_tmp.end());
-    }
-
-    if (changed)
-    {
-      fe.OnStaticParameterChange();
-      for (auto listener : spl->listeners)
-      {
-        listener->OnStaticParameterChange();
-      }
-
-      // Reset change flags for all parameters
+  auto& in_static_parameter_evaluation = ElementsInStaticParameterEvaluation();
+  if (std::find(in_static_parameter_evaluation.begin(), in_static_parameter_evaluation.end(), &fe) != in_static_parameter_evaluation.end())
+  {
+    return;
+  }
+  in_static_parameter_evaluation.push_back(&fe);
+
+  try
+  {
+    // all parameters attached to any of the module's parameters
+    std::vector<tStaticParameterImplementationBase*> attached_parameters;
+    std::vector<tStaticParameterImplementationBase*> attached_parameters_tmp;
+
+    tStaticParameterList* spl = fe.GetAnnotation<tStaticParameterList>();
+    if (spl)
+    {
+
+      // Reevaluate parameters and check whether they have changed
+      bool changed = false;
       for (size_t i = 0; i < spl->Size(); i++)
       {
-        spl->Get(i).ResetChanged();
-      }
-
-      // initialize any new child elements
-      if (fe.IsReady())
-      {
-        fe.Init();
-      }
-    }
-  }
-
-  // evaluate children's static parameters
-  for (auto it = fe.ChildrenBegin(); it != fe.ChildrenEnd(); ++it)
-  {
-    // follow only primary links
-    if ((it->GetParent() == &fe) && (!it->IsDeleted()))
-    {
-      DoStaticParameterEvaluation(*it);
-    }
-  }
-
-  // evaluate any attached parameters that have changed, too
-  for (size_t i = 0; i < attached_parameters.size(); i++)
-  {
-    if (attached_parameters[i]->HasChanged())
-    {
-      DoStaticParameterEvaluation(*attached_parameters[i]->GetParentList()->GetAnnotated());
-    }
-  }
+        spl->Get(i).LoadValue();
+        changed |= spl->Get(i).HasChanged();
+        spl->Get(i).GetAllAttachedParameters(attached_parameters_tmp);
+        attached_parameters.insert(attached_parameters.end(), attached_parameters_tmp.begin(), attached_parameters_tmp.end());
+      }
+
+      if (changed)
+      {
+        fe.OnStaticParameterChange();
+        for (auto listener : spl->listeners)
+        {
+          listener->OnStaticParameterChange();
+        }
+
+        // Reset change flags for all parameters
+        for (size_t i = 0; i < spl->Size(); i++)
+        {
+          spl->Get(i).ResetChanged();
+        }
+
+        // initialize any new child elements
+        if (fe.IsReady())
+        {
+          fe.Init();
+        }
+      }
+    }
+
+    // evaluate children's static parameters
+    for (auto it = fe.ChildrenBegin(); it != fe.ChildrenEnd(); ++it)
+    {
+      // follow only primary links
+      if ((it->GetParent() == &fe) && (!it->IsDeleted()))
+      {
+        DoStaticParameterEvaluation(*it);
+      }
+    }
+
+    // evaluate any attached parameters that have changed, too
+    for (size_t i = 0; i < attached_parameters.size(); i++)
+    {
+      if (attached_parameters[i]->HasChanged())
+      {
+        DoStaticParameterEvaluation(*attached_parameters[i]->GetParentList()->GetAnnotated());
+      }
+    }
+  }
+  catch (const std::exception& e)
+  {
+    FINROC_LOG_PRINT_STATIC(ERROR, "Static parameter evaluation failed in '", fe, "': ", e);
+  }
+
+  assert(in_static_parameter_evaluation.size() && in_static_parameter_evaluation.back() == &fe);
+  in_static_parameter_evaluation.pop_back();
 }