Changeset 22:e2e8d05ef4e4 in finroc_plugins_composite_ports

Timestamp:

02.03.2021 00:15:46 (11 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Message:

Cleanly implements the details of creating service ports in partially instantiated port composite interfaces.

Files:

• internal/type_traits.h (modified) (3 diffs)
• tInterfaceBase.cpp (modified) (5 diffs)
• tInterfaceBase.h (modified) (1 diff)

internal/type_traits.h

@@ -229 +229 @@
 using MakeCounterPartParameterIfInput = MakeCounterDirectionPort<TPort, true>;
 
-template <template <typename> class TPort, bool TServer>
+template <template <typename> class TPort, bool TServer, bool TClient>
 struct MakeRPCPort
 {
   template <typename T>
+  using type = core::tPortWrapperBase;
+};
+template <template <typename> class TPort>
+struct MakeRPCPort<TPort, false, true>
+{
+  template <typename T>
   using base_type = typename std::conditional < std::is_base_of<data_ports::tProxyPort<tTestType, false>, TPort<tTestType>>::value || std::is_base_of<data_ports::tProxyPort<tTestType, true>, TPort<tTestType>>::value, rpc_ports::tProxyPort<T, false>, rpc_ports::tClientPort<T >>::type;
 
@@ -239 +245 @@
 };
 template <template <typename> class TPort>
-struct MakeRPCPort<TPort, true>
+struct MakeRPCPort<TPort, true, false>
 {
   template <typename T>
@@ -249 +255 @@
 
 template <template <typename> class TPort>
-using MakeServerIfInput = MakeRPCPort<TPort, IsInputPort<TPort>::value>;
-template <template <typename> class TPort>
-using MakeClientIfInput = MakeRPCPort<TPort, IsOutputPort<TPort>::value>;
+using MakeServerIfInput = MakeRPCPort<TPort, IsInputPort<TPort>::value, IsOutputPort<TPort>::value>;
+template <template <typename> class TPort>
+using MakeClientIfInput = MakeRPCPort<TPort, IsOutputPort<TPort>::value, IsInputPort<TPort>::value>;
 
 

tInterfaceBase.cpp

@@ -337 +337 @@
 bool tInterfaceBase::tBackend::CreateOutputPort(int primary_relation_id)
 {
-  auto* backend = GetBackend(primary_relation_id);
-  if (backend->GetFlag(tFlag::INTERFACE_FOR_OUTPUTS))
-  {
-    return true;
-  }
-  if (backend->GetFlag(tFlag::INTERFACE_FOR_INPUTS) || backend->GetFlag(tFlag::PARAMETER_INTERFACE))
+  auto backend = GetBackend(primary_relation_id);
+  if (!backend)
   {
     return false;
   }
-  if (backend->GetFlag(tFlag::INTERFACE_FOR_RPC_PORTS))
+  auto component_interface = GetAggregator(*backend);
+  if ((!component_interface) || (!internal::IsComponent(component_interface->GetParent())))
+  {
+    return false;
+  }
+  if (component_interface->GetFlag(tFlag::INTERFACE_FOR_RPC_PORTS))
   {
     int last_relation = primary_relation_id & 0xFF;
@@ -358 +359 @@
       return derived_from_backend_is_output;
     }
+  }
+  if (component_interface->GetFlag(tFlag::INTERFACE_FOR_OUTPUTS))
+  {
+    return true;
+  }
+  if (component_interface->GetFlag(tFlag::INTERFACE_FOR_INPUTS) || component_interface->GetFlag(tFlag::PARAMETER_INTERFACE))
+  {
+    return false;
   }
   throw std::runtime_error("Unspecified port direction");
@@ -424 +433 @@
     }
 
-    tFrameworkElement* parent_candidate = (relation_list.empty() && do_not_create_primary_port_type) ? nullptr : component_interface;
+    tFrameworkElement* parent_candidate = do_not_create_primary_port_type ? nullptr : component_interface;
     core::tFrameworkElementFlags use_these_original_flags;
     if (do_not_create_primary_port_type)
@@ -503 +512 @@
       case internal::tPortTypeRelation::ePTR_CLIENT_IF_INPUT:
         target_set_flags = tFlag::INTERFACE_FOR_RPC_PORTS;
-        target_unset_flags = core::tFrameworkElementFlags();
+        target_unset_flags = (partial_interface && (!parent_candidate)) ? target_set_flags : core::tFrameworkElementFlags(); // With partially instantiated interfaces, create service ports if the port types they are derived from are also created
         break;
       default:
@@ -525 +534 @@
       }
 
-      if ((!new_candidate) && this->IsPartialInterface() && ((partial_interface_direction_is_output && (!target_set_flags.Get(tFlag::INTERFACE_FOR_OUTPUTS))) || ((!partial_interface_direction_is_output) && target_set_flags.Get(tFlag::INTERFACE_FOR_OUTPUTS))))
+      if ((!new_candidate) && this->IsPartialInterface() && ((partial_interface_direction_is_output && (!target_set_flags.Get(tFlag::INTERFACE_FOR_OUTPUTS))) || ((!partial_interface_direction_is_output) && target_set_flags.Get(tFlag::INTERFACE_FOR_OUTPUTS)) || target_set_flags.Get(tFlag::INTERFACE_FOR_RPC_PORTS)))
       {
         use_these_original_flags = target_set_flags;

tInterfaceBase.h

@@ -235 +235 @@
 
     /*!
-     * \param any_port_type Whether backend is a generic port (-> unspecified whether input or output)
+     * \param generic_port_backend Whether backend is a generic port (-> unspecified whether input or output)
      * \return Default port flags for ports below this backend
      */