BUILD_RTI guards for DDS/Routing modules + logger init fixes
- Lts/DDS: Add BUILD_RTI guards to pacemaker.h, dds_connector.h, generic_fts_* files, generic_base.h, routing_plugin.h - Lts/Services/RoutingServiceNG: Add BUILD_RTI guards to session.h/cpp, connection.h/cpp, data_writer_task.h/cpp - Fix C++23 reference member initialization: use getLogger() instead of getNGLLogger() in constructor initializer lists - Root CMakeLists.txt: Add Lts/DDS to include_directories - Fix export header generation order (GENERATE_EXPORT_HEADER before TARGET_INCLUDE_DIRECTORIES) - Remove auto-generated stub files (external deps collected separately)
This commit is contained in:
1 parent
6588fc7d3f
commit
3cc3129de0
27 files changed
+339
-92
No files matched your search
@@ -24,15 +24,17 @@ namespace RoutingService
|
||||
Connection::Connection(const dds::domain::DomainParticipant &domainParticipant,
|
||||
const std::string &partition,
|
||||
const std::vector<TopicDispatcherInterface *> &topicsToRoute,
|
||||
const std::string &desc) : m_output(nullptr)
|
||||
const std::string &desc)
|
||||
: m_output(nullptr)
|
||||
, m_domainParticipant(domainParticipant)
|
||||
, m_publisher(new DDSConnector::Publisher(domainParticipant, partition))
|
||||
, m_subscriber(new DDSConnector::Subscriber(domainParticipant, partition, false))
|
||||
, m_dataWriterTask(nullptr)
|
||||
, m_topicsToRoute(topicsToRoute)
|
||||
, m_partition(partition)
|
||||
, m_description(desc),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_description(desc)
|
||||
, m_logger(getLogger("Connection"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Create connection: " << partition
|
||||
<< ", domain: " << domainParticipant.domain_id()
|
||||
<< ", direction: " << m_description
|
||||
|
||||
@@ -39,7 +39,6 @@ public:
|
||||
dds::sub::Subscriber subscriber() const;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool initTopics();
|
||||
|
||||
private:
|
||||
|
||||
@@ -11,13 +11,15 @@
|
||||
namespace RoutingService
|
||||
{
|
||||
DataWriterTask::DataWriterTask()
|
||||
: m_doShutdown(false)
|
||||
: m_logger(getLogger("DataWriterTask"))
|
||||
, m_doShutdown(false)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << this << ": init ";
|
||||
}
|
||||
|
||||
DataWriterTask::~DataWriterTask()
|
||||
{
|
||||
#if BUILD_RTI
|
||||
std::lock_guard<std::mutex> lock(m_queueLock);
|
||||
DEBUG_LOG(m_logger) << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
|
||||
while (!m_writerQueue.empty())
|
||||
@@ -25,8 +27,10 @@ DataWriterTask::~DataWriterTask()
|
||||
delete m_writerQueue.front();
|
||||
m_writerQueue.pop();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#if BUILD_RTI
|
||||
void DataWriterTask::enqueue(SampleWriterInterface *swi)
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_queueLock);
|
||||
@@ -100,5 +104,6 @@ void DataWriterTask::writeSamples()
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // BUILD_RTI
|
||||
|
||||
} // namespace RoutingService
|
||||
@@ -12,10 +12,11 @@
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/Routing/routing_plugin.h>
|
||||
#endif
|
||||
#include "logger.h"
|
||||
|
||||
namespace RoutingService
|
||||
{
|
||||
@@ -25,16 +26,27 @@ public:
|
||||
DataWriterTask();
|
||||
~DataWriterTask();
|
||||
|
||||
#if BUILD_RTI
|
||||
void enqueue(SampleWriterInterface *swi) override;
|
||||
void shutdown();
|
||||
bool waitForData();
|
||||
|
||||
SampleWriterInterface *getNextSampleWriter();
|
||||
void writeSamples();
|
||||
#else
|
||||
// Stub methods when BUILD_RTI is disabled
|
||||
void enqueue(void* /*swi*/) override {}
|
||||
void shutdown() {}
|
||||
bool waitForData() { return false; }
|
||||
void *getNextSampleWriter() { return nullptr; }
|
||||
void writeSamples() {}
|
||||
#endif
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
#if BUILD_RTI
|
||||
std::queue<SampleWriterInterface *> m_writerQueue;
|
||||
#endif
|
||||
std::mutex m_queueLock;
|
||||
std::condition_variable m_waitForDataCondition;
|
||||
bool m_doShutdown;
|
||||
|
||||
@@ -12,9 +12,12 @@
|
||||
#if BUILD_RTI
|
||||
namespace RoutingService
|
||||
{
|
||||
Session::Session(const QString &partitionNameSv, const QString &partitionNameWs) : m_partitionNameSv(partitionNameSv.toStdString())
|
||||
, m_partitionNameWs(partitionNameWs.toStdString()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
Session::Session(const QString &partitionNameSv, const QString &partitionNameWs)
|
||||
: m_partitionNameSv(partitionNameSv.toStdString())
|
||||
, m_partitionNameWs(partitionNameWs.toStdString())
|
||||
, m_logger(getLogger("Session"))
|
||||
{
|
||||
}
|
||||
|
||||
Session::~Session()
|
||||
{
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
|
||||
#include <string>
|
||||
#include <QString>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include "connection.h"
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user