Changeset 177:92c581db5581 in finroc_plugins_data_ports

Timestamp:

25.03.2021 07:52:14 (4 weeks ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Phase:

public

Message:

Fixes bug in recent changeset 3f95d4a4a332 ('Adds Publish method with const data buffer to tGenericPort')

Files:

• api/tGenericPortImplementation.h (modified) (2 diffs)
• tGenericPort.h (modified) (1 diff)

api/tGenericPortImplementation.h

@@ -183 +183 @@
    * This publish()-variant is efficient with all data types.
    */
-  template <typename T>
-  inline void Publish(core::tAbstractPort& port, tPortDataPointer<T>& data_buffer)
+  inline void Publish(core::tAbstractPort& port, tPortDataPointer<rrlib::rtti::tGenericObject>& data_buffer)
   {
     if (IsCheaplyCopiedType(port.GetDataType()))
@@ -214 +213 @@
 
   /*!
+   * Publish Data Buffer obtained from another port. This data will be forwarded to any connected ports.
+   * Should only be called on output ports.
+   *
+   * \param port Wrapped port to operate on
+   * \param data_buffer Data to publish.
+   *
+   * This publish()-variant is efficient with all data types.
+   */
+  inline void PublishConstBuffer(core::tAbstractPort& port, tPortDataPointer<const rrlib::rtti::tGenericObject>& data_buffer)
+  {
+    if (IsCheaplyCopiedType(port.GetDataType()))
+    {
+      this->Publish(port, *data_buffer, data_buffer.GetTimestamp()); // copy and publish (as non-generic ports)
+    }
+    else
+    {
+      standard::tStandardPort::tLockingManagerPointer buffer(static_cast<standard::tPortBufferManager*>(data_buffer.implementation.Release()));
+      assert(!buffer->IsUnused());
+      static_cast<standard::tStandardPort&>(port).Publish(buffer);
+    }
+  }
+
+  /*!
    * Set new bounds
    * (This is not thread-safe and must only be done in "pause mode")

tGenericPort.h

@@ -314 +314 @@
   inline void Publish(tPortDataPointer<const rrlib::rtti::tGenericObject>& buffer)
   {
-    implementation->Publish(*GetWrapped(), buffer);
+    implementation->PublishConstBuffer(*GetWrapped(), buffer);
   }