Changeset 62:feac8788900e in finroc_plugins_scheduling

Timestamp:

21.03.2021 22:40:07 (4 weeks ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Removes obsolete heuristic in tThreadContainerThread::IsModuleInputInterface (and prints warning should this change behavior anywhere). This fixes subtle bug (w.r.t. to scheduling dependencies) when using only composite ports in component output interfaces.

File:

• tThreadContainerThread.cpp (modified) (1 diff)

tThreadContainerThread.cpp

@@ -351 +351 @@
 bool tThreadContainerThread::IsModuleInputInterface(core::tFrameworkElement& fe)
 {
-  if (IsInterface(fe))
-  {
-    uint port_count = 0;
-    uint pure_input_port_count = 0;
-    for (auto it = fe.ChildPortsBegin(); it != fe.ChildPortsEnd(); ++it)
-    {
-      if (data_ports::IsDataFlowType(it->GetDataType()))
-      {
-        port_count++;
-        if (it->GetFlag(tFlag::ACCEPTS_DATA) && (!it->GetFlag(tFlag::EMITS_DATA)))
-        {
-          pure_input_port_count++;
-        }
-      }
-    }
-    return (2 * pure_input_port_count) >= port_count; // heuristic: min. 50% of ports are pure input ports
-  }
-  return false;
+  const core::tFrameworkElementFlags cCHECK_FLAGS = tFlag::PORT | tFlag::INTERFACE | tFlag::INTERFACE_FOR_DATA_PORTS | tFlag::INTERFACE_FOR_INPUTS | tFlag::INTERFACE_FOR_OUTPUTS;
+  const core::tFrameworkElementFlags cCHECK_FLAGS_RESULT = tFlag::INTERFACE | tFlag::INTERFACE_FOR_DATA_PORTS | tFlag::INTERFACE_FOR_INPUTS;
+  bool result = (fe.GetAllFlags().Raw() & cCHECK_FLAGS.Raw()) == cCHECK_FLAGS_RESULT.Raw();
+#ifndef NDEBUG
+  {
+    bool former_result = false;
+    if (IsInterface(fe))
+    {
+      uint port_count = 0;
+      uint pure_input_port_count = 0;
+      for (auto it = fe.ChildPortsBegin(); it != fe.ChildPortsEnd(); ++it)
+      {
+        if (data_ports::IsDataFlowType(it->GetDataType()) || it->GetDataType().GetTypeClassification() == rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE)
+        {
+          port_count++;
+          if (it->GetFlag(tFlag::ACCEPTS_DATA) && (!it->GetFlag(tFlag::EMITS_DATA)))
+          {
+            pure_input_port_count++;
+          }
+        }
+      }
+      former_result = (2 * pure_input_port_count) >= port_count; // heuristic: min. 50% of ports are pure input ports; THIS is erroneous if interface contains no data ports - or composite ports
+    }
+    if (former_result != result)
+    {
+      FINROC_LOG_PRINT_STATIC(WARNING, "Inconsistent results for ", fe);
+    }
+  }
+#endif
+  return result;
 }