Changeset 115:fd7b0e5ec9ea in finroc_plugins_data_ports

Timestamp:

08.06.2017 02:34:37 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Rebase:

34346233396662386532633930663564396239663366666437323665613063346363616438636638

Message:

Makes initial pushing mechanism use/respect type conversion

Files:

• optimized/tCheapCopyPort.cpp (modified) (1 diff)
• optimized/tSingleThreadedCheapCopyPortGeneric.cpp (modified) (1 diff)
• standard/tStandardPort.cpp (modified) (1 diff)

optimized/tCheapCopyPort.cpp

@@ -384 +384 @@
   tUnusedManagerPointer unused_manager(tGlobalBufferPools::Instance().GetUnusedBuffer(cheaply_copyable_type_index).release());
   CopyCurrentValueToManager(*unused_manager, tStrategy::NEVER_PULL);
-  common::tPublishOperation<tCheapCopyPort, tPublishingDataGlobalBuffer> data(unused_manager);
-  tCheapCopyPort& target_port = static_cast<tCheapCopyPort&>(connector.Destination());
-  common::tPublishOperation<tCheapCopyPort, tPublishingDataGlobalBuffer>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  if (typeid(connector) == typeid(common::tConversionConnector))
+  {
+    static_cast<common::tConversionConnector&>(connector).Publish(unused_manager->GetObject(), tChangeStatus::CHANGED_INITIAL);
+  }
+  else
+  {
+    common::tPublishOperation<tCheapCopyPort, tPublishingDataGlobalBuffer> data(unused_manager);
+    tCheapCopyPort& target_port = static_cast<tCheapCopyPort&>(connector.Destination());
+    common::tPublishOperation<tCheapCopyPort, tPublishingDataGlobalBuffer>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  }
 }
 

optimized/tSingleThreadedCheapCopyPortGeneric.cpp

@@ -162 +162 @@
 void tSingleThreadedCheapCopyPortGeneric::InitialPushTo(core::tConnector& connector)
 {
-  common::tPublishOperation<tSingleThreadedCheapCopyPortGeneric, tPublishingData> data(current_value);
-  tSingleThreadedCheapCopyPortGeneric& target_port = static_cast<tSingleThreadedCheapCopyPortGeneric&>(connector.Destination());
-  common::tPublishOperation<tSingleThreadedCheapCopyPortGeneric, tPublishingData>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  if (typeid(connector) == typeid(common::tConversionConnector))
+  {
+    static_cast<common::tConversionConnector&>(connector).Publish(*current_value.data, tChangeStatus::CHANGED_INITIAL);
+  }
+  else
+  {
+    common::tPublishOperation<tSingleThreadedCheapCopyPortGeneric, tPublishingData> data(current_value);
+    tSingleThreadedCheapCopyPortGeneric& target_port = static_cast<tSingleThreadedCheapCopyPortGeneric&>(connector.Destination());
+    common::tPublishOperation<tSingleThreadedCheapCopyPortGeneric, tPublishingData>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  }
 }
 

standard/tStandardPort.cpp

@@ -272 +272 @@
   assert(IsReady());
 
-  common::tPublishOperation<tStandardPort, tPublishingData> data(manager, 1000);
-  tStandardPort& target_port = static_cast<tStandardPort&>(connector.Destination());
-  common::tPublishOperation<tStandardPort, tPublishingData>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  if (typeid(connector) == typeid(common::tConversionConnector))
+  {
+    static_cast<common::tConversionConnector&>(connector).Publish(manager->GetObject(), tChangeStatus::CHANGED_INITIAL);
+  }
+  else
+  {
+    common::tPublishOperation<tStandardPort, tPublishingData> data(manager, 1000);
+    tStandardPort& target_port = static_cast<tStandardPort&>(connector.Destination());
+    common::tPublishOperation<tStandardPort, tPublishingData>::Receive<tChangeStatus::CHANGED_INITIAL>(data, target_port, *this);
+  }
 }