Changeset 10:475d7a686fd6 in finroc_plugins_composite_ports

Timestamp:

21.03.2020 16:11:47 (12 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Message:

Adds support for inheritance among port composite interfaces (sub and superclass interfaces can be connected). Change also includes that connecting secondary backends (of port composite interfaces with multiple port types) will not connect the primary. This adds more flexibility/convenience w.r.t. connecting only parts of port composite interfaces.

Files:

• examples/example.finroc (modified) (1 diff)
• examples/gUser.xml (modified) (1 diff)
• internal/tTypeInfo.h (added)
• tInterface.h (modified) (1 diff)
• tInterfaceBase.cpp (modified) (2 diffs)
• tInterfaceType.h (modified) (5 diffs)

examples/example.finroc

@@ -23 +23 @@
   <edge src="Aggregator Coded/Sensor Output/Simple 2" dest="Group With User/Sensor Input/Simple 1"/>
   <edge src="Aggregator Coded/Sensor Output/Simple 3" dest="Group With User/Sensor Input/Simple 2"/>
+  <edge src="Aggregator/Sensor Output/Fancy 1" dest="Group With User/Sensor Input/I%2FO Interconnected"/>
   <edge src="Aggregator/Sensor Output/Fancy 2" dest="Group With User/Sensor Input/Fancy 2"/>
   <edge src="Aggregator/Sensor Output/Input Output Interface 4" dest="Group With User/Sensor Input/I%2FO Interface 3"/>

examples/gUser.xml

@@ -12 +12 @@
     <port name="Simple 3" type="finroc.composite_ports.examples.interfaces.Simple"/>
     <port name="Simple 4" type="finroc.composite_ports.examples.interfaces.Simple"/>
+    <port name="I/O Interconnected" type="finroc.composite_ports.examples.interfaces.InputOutput"/>
   </interface>
   <element name="Interface User" group="finroc_plugins_composite_ports_example" type="InterfaceUser">

tInterface.h

@@ -104 +104 @@
 
   typedef typename std::conditional<cCONVENIENCE_PORT, structure::tComponent*, core::tPortGroup*>::type tParent;
+  typedef tInterfaceBase tBase;
 
 //----------------------------------------------------------------------

tInterfaceBase.cpp

@@ -389 +389 @@
 void tInterfaceBase::tBackend::OnConnect(tAbstractPort& partner, bool partner_is_destination)
 {
-  if (&primary_backend != this)
-  {
-    primary_backend.OnConnect(partner, this->IsOutputPort() == primary_backend.IsOutputPort() ? partner_is_destination : (!partner_is_destination));
+  if (primary_backend.operation_on_all_elements_pending)
+  {
     return;
   }
-  if (this->operation_on_all_elements_pending)
-  {
-    return;
-  }
-
-  this->operation_on_all_elements_pending = true;
+
+  tBackend& other = static_cast<tBackend&>(partner);
+  bool connect_all_backends = this->IsPrimaryBackend() && other.IsPrimaryBackend();
+
+  primary_backend.operation_on_all_elements_pending = true;
   try
   {
-    tBackend& other = static_cast<tBackend&>(partner).primary_backend;
-    if (this->custom_connect_function)
+    if (primary_backend.custom_connect_function)
     {
       if (partner_is_destination)
       {
-        custom_connect_function(*this, other);
+        primary_backend.custom_connect_function(*this, other);
       }
       else
       {
-        custom_connect_function(other, *this);
-      }
-      this->operation_on_all_elements_pending = false;
+        primary_backend.custom_connect_function(other, *this);
+      }
+      primary_backend.operation_on_all_elements_pending = false;
       return;
     }
 
     // Connect all matching backends and ports
-    for (auto this_backend : this->relation_backend_mapping)
-    {
-      for (auto other_backend : other.primary_backend.relation_backend_mapping)
-      {
-        if (this_backend.first - this->primary_relation_id == other_backend.first - other.primary_relation_id)
+    for (auto this_backend : primary_backend.relation_backend_mapping)
+    {
+      for (auto other_backend : other.primary_backend.primary_backend.relation_backend_mapping)
+      {
+        if (this_backend.first - primary_backend.primary_relation_id == other_backend.first - other.primary_backend.primary_relation_id && (connect_all_backends || this_backend.second == this || other_backend.second == &other))
         {
           core::tConnectionFlag direction = (this->IsOutputPort() == this_backend.second->IsOutputPort() ? partner_is_destination : (!partner_is_destination)) ? core::tConnectionFlag::DIRECTION_TO_DESTINATION : core::tConnectionFlag::DIRECTION_TO_SOURCE;
@@ -435 +432 @@
     FINROC_LOG_PRINT(WARNING, "Connecting failed: ", e);
   }
-  this->operation_on_all_elements_pending = false;
+  primary_backend.operation_on_all_elements_pending = false;
 }
 

tInterfaceType.h

@@ -48 +48 @@
 // Internal includes with ""
 //----------------------------------------------------------------------
-#include "plugins/composite_ports/internal/tInterfaceTypeInfo.h"
-#include "plugins/composite_ports/internal/tGenericPortType.h"
+#include "plugins/composite_ports/internal/tTypeInfo.h"
 
 //----------------------------------------------------------------------
@@ -62 +61 @@
 // Forward declarations / typedefs / enums
 //----------------------------------------------------------------------
-
-/*!
- * Port class that is suitable for generic instantiation of any interface
- */
-template <typename T>
-class tAnyPortType : public internal::tGenericPortType<0, data_ports::tPort, T, false>
-{
-  using internal::tGenericPortType<0, data_ports::tPort, T, false>::tGenericPortType;
-};
 
 //----------------------------------------------------------------------
@@ -91 +81 @@
 
   typedef TInterface<tAnyPortType> tGeneric;
+  typedef internal::tTypeInfo<tGeneric> tHolder;
 
   tInterfaceType() :
-    rrlib::rtti::tType(&cTYPE_INFO)
+    rrlib::rtti::tType(&tHolder::cTYPE_INFO)
   {
   }
@@ -99 +90 @@
   template <size_t Tchars>
   tInterfaceType(const char(&name)[Tchars]) :
-    rrlib::rtti::tType(&cTYPE_INFO)
+    rrlib::rtti::tType(&tHolder::cTYPE_INFO)
   {
-    GetSharedInfo().SetName(rrlib::util::tManagedConstCharPointer(name, false), &cTYPE_INFO);
+    GetSharedInfo().SetName(rrlib::util::tManagedConstCharPointer(name, false), &tHolder::cTYPE_INFO);
   }
 
   template <typename ... TFunctions>
   tInterfaceType(const std::string& name) :
-    rrlib::rtti::tType(&cTYPE_INFO)
+    rrlib::rtti::tType(&tHolder::cTYPE_INFO)
   {
-    GetSharedInfo().SetName(rrlib::util::tManagedConstCharPointer(name.c_str(), true), &cTYPE_INFO);
+    GetSharedInfo().SetName(rrlib::util::tManagedConstCharPointer(name.c_str(), true), &tHolder::cTYPE_INFO);
   }
 
@@ -116 +107 @@
 private:
 
-  /*! Shared Type Info for this type */
-  static internal::tInterfaceTypeInfo shared_info;
-
-  /*! Type info for this type */
-  static constexpr rrlib::rtti::detail::tTypeInfo cTYPE_INFO = { typeid(tGeneric), static_cast<uint>(rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE), &rrlib::rtti::detail::tTypeInfo::cNULL_TYPE_INFO, &rrlib::rtti::detail::tTypeInfo::cNULL_TYPE_INFO, &shared_info, sizeof(tGeneric) };
-
-  /*! Generic create function */
-  static tInterfaceBase Create(const std::string& name, core::tPortGroup* parent)
-  {
-    return tGeneric(name, parent);
-  }
-
 };
-
-
-template <template <template <typename> class TPrimaryPort, template <typename> class ... TSecondaryPorts> class TInterface>
-constexpr rrlib::rtti::detail::tTypeInfo tInterfaceType<TInterface>::cTYPE_INFO;
-
-template <template <template <typename> class TPrimaryPort, template <typename> class ... TSecondaryPorts> class TInterface>
-internal::tInterfaceTypeInfo tInterfaceType<TInterface>::shared_info(&tInterfaceType<TInterface>::cTYPE_INFO, &tInterfaceType<TInterface>::Create, 0);
 
 //----------------------------------------------------------------------