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
@@ -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
|
||||
Reference in new issue
Block a user