Changeset 472:caae658585be in finroc_core

Timestamp:

25.02.2020 06:58:33 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Children:

473:4b81cd5b0170, 474:fbdcd51b85a7

Phase:

public

Message:

Makes core support composite ports (ports with children)

Files:

• port/tAbstractPort.cpp (modified) (3 diffs)
• port/tAbstractPort.h (modified) (2 diffs)
• port/tEdgeAggregator.cpp (modified) (1 diff)
• port/tEdgeAggregator.h (modified) (1 diff)
• port/tPortGroup.h (modified) (1 diff)
• tFrameworkElement.cpp (modified) (2 diffs)
• tFrameworkElementFlags.h (modified) (1 diff)

port/tAbstractPort.cpp

@@ -563 +563 @@
     // count parents
     int this_parent_node_count = 1;
-    tFrameworkElement* parent = this->GetParent();
+    const tFrameworkElement* parent = this;
     while ((parent = parent->GetParent()))
     {
-      this_parent_node_count++;
+      if (!parent->IsPort())
+      {
+        this_parent_node_count++;
+      }
     }
 
     int other_parent_node_count = 1;
-    parent = other.GetParent();
+    parent = &other;
     while ((parent = parent->GetParent()))
     {
-      other_parent_node_count++;
+      if (!parent->IsPort())
+      {
+        other_parent_node_count++;
+      }
     }
 
@@ -607 +613 @@
   else
   {
-    tFrameworkElement* component = (GetParent() && GetParent()->GetFlag(tFlag::INTERFACE)) ? GetParent()->GetParent() : nullptr;
+    tFrameworkElement* interface_candidate = this->GetParent();
+    while (interface_candidate && interface_candidate->IsPort())
+    {
+      interface_candidate = interface_candidate->GetParent();
+    }
+    tFrameworkElement* component = (interface_candidate && interface_candidate->GetFlag(tFlag::INTERFACE)) ? interface_candidate->GetParent() : nullptr;
     if (component)
     {
@@ -617 +628 @@
     else
     {
-      FINROC_LOG_PRINT(WARNING, "This proxy port is not part of a interface. So far, no heuristics for this case have been implemented. Guessing connect direction to be its primary connect direction.");
+      FINROC_LOG_PRINT(WARNING, "This proxy port is not part of an interface. So far, no heuristics for this case have been implemented. Guessing connect direction to be its primary connect direction.");
       to_destination = this->IsOutputPort();
     }

port/tAbstractPort.h

@@ -416 +416 @@
   virtual tConnectDirection InferConnectDirection(const tPath& path) const;
 
+  virtual void OnManagedDelete() override;
+
 //----------------------------------------------------------------------
 // Private fields and methods
@@ -494 +496 @@
   }
 
-  virtual void OnManagedDelete() override;
-
 };
 

port/tEdgeAggregator.cpp

@@ -145 +145 @@
   while (current)
   {
-    if (current->GetFlag(tFlag::EDGE_AGGREGATOR) && (!current->GetFlag(tFlag::NETWORK_ELEMENT)))
+    if (current->GetFlag(tFlag::EDGE_AGGREGATOR) && (!current->GetFlag(tFlag::NETWORK_ELEMENT)) && (!current->IsPort()))
     {
       return static_cast<tEdgeAggregator*>(current);

port/tEdgeAggregator.h

@@ -139 +139 @@
   inline static bool IsDataFlowType(const rrlib::rtti::tType& type)
   {
-    return type.GetTypeClassification() != rrlib::rtti::tTypeClassification::RPC_TYPE;
+    return type.GetTypeClassification() != rrlib::rtti::tTypeClassification::RPC_TYPE && type.GetTypeClassification() != rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE;
   }
 

port/tPortGroup.h

@@ -175 +175 @@
    * \return Default flags for any ports to be created in this Group
    */
-  tFlags GetDefaultPortFlags()
+  tFlags GetDefaultPortFlags() const
   {
     return default_port_flags;

tFrameworkElement.cpp

@@ -120 +120 @@
   creater_thread_uid(rrlib::thread::tThread::CurrentThreadId()),
 #endif
-  flags(flags),
-  children(flags.Get(tFlag::PORT) ? &empty_child_set : new tChildSet())
-{
-  if (flags.Raw() & cSTATUS_FLAGS.Raw())
-  {
-    FINROC_LOG_PRINT(ERROR, "No status flags may be set in constructor");
-    abort();
-  }
+  flags(flags.Raw() & (~cSTATUS_FLAGS.Raw())),
+  children(flags.Get(tFlag::PORT) && (!flags.Get(tFlag::COMPOSITE_PORT)) ? &empty_child_set : new tChildSet())
+{
   if (name.length() > 0)
   {
@@ -184 +179 @@
 void tFrameworkElement::AddChild(tLink& child)
 {
-  if (IsPort())
+  if (IsPort() && (!flags.Get(tFlag::COMPOSITE_PORT)))
   {
     FINROC_LOG_PRINT(ERROR, "Cannot add children to port");

tFrameworkElementFlags.h

@@ -110 +110 @@
   // Constant flags
   UNUSED_CONSTANT_PORT_FLAG_4 = EDGE_AGGREGATOR,
-  UNUSED_CONSTANT_PORT_FLAG_3,
+  COMPOSITE_PORT,          //!< Port with child ports
   SENSOR_DATA_PORT,        //!< Is the data processed in this port sensor data? (hint for visualization; relevant for interface especially)
   CONTROLLER_DATA_PORT,    //!< Is the data processed in this port controller data? (hint for visualization; relevant for interface especially)