torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
115 lines
2.9 KiB
C++
115 lines
2.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
*
|
|
* Publisher
|
|
* Uses DTSs to publish data
|
|
*
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include "publisher.h"
|
|
#include "pub_sub_base_p.h"
|
|
|
|
#include <dds/pub/AnyDataWriter.hpp>
|
|
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
|
#include <NGLLogger/INGLLogger.h>
|
|
|
|
namespace DDSConnector
|
|
{
|
|
|
|
Publisher::Publisher(const dds::domain::DomainParticipant &domainParticipant, const std::string &partition)
|
|
: PubSubBase(domainParticipant, partition, "DDSConnector.Publisher")
|
|
, m_ddsPublisher(nullptr)
|
|
{
|
|
Q_ASSERT(domainParticipant != nullptr);
|
|
initDDS();
|
|
}
|
|
|
|
|
|
Publisher::~Publisher()
|
|
{
|
|
try
|
|
{
|
|
deleteDDS();
|
|
} catch (...)
|
|
{}
|
|
}
|
|
|
|
void Publisher::initDDS()
|
|
{
|
|
if (m_partitions.empty())
|
|
return;
|
|
|
|
// some debug output
|
|
if (m_logger.isDebugEnabled()) {
|
|
DEBUG_LOG(m_logger) << "Publisher (DataWriter) Qos: ";
|
|
dds::core::QosProvider qosProvider = dds::core::QosProvider::Default();
|
|
DDS::QosProfile::print(qosProvider.datawriter_qos(), m_logger);
|
|
}
|
|
|
|
dds::pub::qos::PublisherQos publisherQos = m_domainParticipant.default_publisher_qos();
|
|
|
|
// set a name for rtiadminconsole
|
|
rti::core::policy::EntityName entityName;
|
|
entityName.name(std::string("Pub ") + m_partitions.front());
|
|
publisherQos << entityName;
|
|
|
|
DEBUG_LOG(m_logger) << "Publish data on partition " << m_partitions.front();
|
|
|
|
m_ddsPublisher = dds::pub::Publisher(m_domainParticipant, publisherQos); // TODO: StatusMask auf NONE setzen?
|
|
|
|
enableBatchedWriter(false);
|
|
|
|
updatePartitionQoS(m_ddsPublisher);
|
|
}
|
|
|
|
void Publisher::enableBatchedWriter(bool bEnable)
|
|
{
|
|
dds::pub::qos::DataWriterQos dwQos = m_ddsPublisher.default_datawriter_qos();
|
|
auto batch = (bEnable ? rti::core::policy::Batch::Enabled() : rti::core::policy::Batch::Disabled());
|
|
if (bEnable)
|
|
{
|
|
batch.max_data_bytes(64 * 1024); // 64kb
|
|
batch.max_flush_delay(dds::core::Duration::from_millisecs(10));
|
|
}
|
|
dwQos << batch;
|
|
m_ddsPublisher.default_datawriter_qos(dwQos);
|
|
}
|
|
|
|
void Publisher::deleteDDS()
|
|
{
|
|
qDeleteAll(m_dtsMap);
|
|
qDeleteAll(m_dynamicTypeMap);
|
|
m_ddsPublisher = nullptr;
|
|
}
|
|
|
|
bool Publisher::write(const dds::core::xtypes::DynamicData &data, const std::string &topicName)
|
|
{
|
|
DEBUG_LOG(m_logger) << "Publish dynamic data for topic (" << topicName << ")";
|
|
|
|
try
|
|
{
|
|
|
|
dds::pub::AnyDataWriter* anyWriter = m_dynamicTypeMap.value(topicName);
|
|
if (anyWriter == nullptr)
|
|
{
|
|
dds::topic::Topic<dds::core::xtypes::DynamicData> topic(m_domainParticipant, topicName, data.type());
|
|
auto writer = dds::pub::DataWriter<dds::core::xtypes::DynamicData>(m_ddsPublisher, topic);
|
|
anyWriter = new dds::pub::AnyDataWriter(writer);
|
|
m_dynamicTypeMap.insert(topicName, anyWriter);
|
|
}
|
|
anyWriter->get<dds::core::xtypes::DynamicData>().write(data);
|
|
|
|
}
|
|
catch ( ... )
|
|
{
|
|
ERROR_LOG(m_logger) << "Failed to publish data for topic (" << topicName << ")";
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
} // Namespace DDSConnector
|