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>
83 lines
2.2 KiB
C++
83 lines
2.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
*
|
|
* Subscriber (DDSConnector)
|
|
* Uses DTCs/DDTCs to subscribe to data
|
|
*
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "subscriber.h"
|
|
#include "pub_sub_base_p.h"
|
|
|
|
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
|
#include <NGLLogger/INGLLogger.h>
|
|
|
|
namespace DDSConnector
|
|
{
|
|
Subscriber::Subscriber(const dds::domain::DomainParticipant &domainParticipant, const std::string &partition, bool bUseSubscriberListener)
|
|
: PubSubBase(domainParticipant, partition, "DDSConnector.Subscriber")
|
|
, m_ddsSubscriber(nullptr)
|
|
, m_subscriberListener(bUseSubscriberListener ? new DDSGeneric::SubscriberListener : nullptr)
|
|
, m_subscriberListenerBinder(nullptr)
|
|
{
|
|
Q_ASSERT(domainParticipant != nullptr);
|
|
initDDS();
|
|
}
|
|
|
|
Subscriber::~Subscriber()
|
|
{
|
|
try
|
|
{
|
|
deleteDDS();
|
|
} catch (...)
|
|
{}
|
|
}
|
|
|
|
void Subscriber::initDDS()
|
|
{
|
|
if (m_partitions.empty())
|
|
return;
|
|
|
|
// some debug output
|
|
if (m_logger.isDebugEnabled()) {
|
|
DEBUG_LOG(m_logger) << "Subscriber (DataReader) Qos: ";
|
|
dds::core::QosProvider qosProvider = dds::core::QosProvider::Default();
|
|
DDS::QosProfile::print(qosProvider.datareader_qos(), m_logger);
|
|
}
|
|
|
|
dds::sub::qos::SubscriberQos subscriberQos = m_domainParticipant.default_subscriber_qos();
|
|
|
|
// set a name for rtiadminconsole
|
|
rti::core::policy::EntityName entityName;
|
|
entityName.name(std::string("Sub ") + m_partitions.front());
|
|
subscriberQos << entityName;
|
|
|
|
DEBUG_LOG(m_logger) << "Subscribe on partition " << m_partitions.front();
|
|
|
|
m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipant,
|
|
subscriberQos);
|
|
|
|
if (m_subscriberListener)
|
|
m_subscriberListenerBinder = rti::core::bind_and_manage_listener(m_ddsSubscriber,
|
|
m_subscriberListener,
|
|
DDSGeneric::SubscriberListener::mask());
|
|
|
|
updatePartitionQoS(m_ddsSubscriber);
|
|
}
|
|
|
|
void Subscriber::deleteDDS()
|
|
{
|
|
if (m_subscriberListener)
|
|
{
|
|
m_subscriberListener->prepareShutdown();
|
|
m_subscriberListener = nullptr; // will be deleted due to bind_listener
|
|
}
|
|
m_subscriberListenerBinder = nullptr;
|
|
m_ddsSubscriber = nullptr;
|
|
}
|
|
|
|
} // Namespace DDSConnector
|