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>
106 lines
2.3 KiB
C++
106 lines
2.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Routing Test - data writer thread
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "data_writer_task.h"
|
|
|
|
namespace RoutingService
|
|
{
|
|
DataWriterTask::DataWriterTask()
|
|
: m_doShutdown(false)
|
|
, m_logger(getLogger("DataWriterTask"))
|
|
{
|
|
DEBUG_LOG(m_logger) << this << ": init ";
|
|
}
|
|
|
|
DataWriterTask::~DataWriterTask()
|
|
{
|
|
std::lock_guard<std::mutex> lock(m_queueLock);
|
|
DEBUG_LOG(m_logger) << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
|
|
while (!m_writerQueue.empty())
|
|
{
|
|
delete m_writerQueue.front();
|
|
m_writerQueue.pop();
|
|
}
|
|
}
|
|
|
|
void DataWriterTask::enqueue(SampleWriterInterface *swi)
|
|
{
|
|
std::lock_guard<std::mutex> lock(m_queueLock);
|
|
TRACE_LOG(m_logger) << this << ": enqueue " << swi << " shutdown: " << m_doShutdown;
|
|
if (m_doShutdown)
|
|
{
|
|
delete swi;
|
|
return;
|
|
}
|
|
m_writerQueue.push(swi);
|
|
m_waitForDataCondition.notify_one();
|
|
}
|
|
|
|
void DataWriterTask::shutdown()
|
|
{
|
|
std::lock_guard<std::mutex> l(m_queueLock);
|
|
m_doShutdown = true;
|
|
DEBUG_LOG(m_logger) << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
|
|
while (!m_writerQueue.empty())
|
|
{
|
|
delete m_writerQueue.front();
|
|
m_writerQueue.pop();
|
|
}
|
|
|
|
m_waitForDataCondition.notify_one();
|
|
}
|
|
|
|
bool DataWriterTask::waitForData()
|
|
{
|
|
TRACE_LOG(m_logger) << this << ": waiting for data ";
|
|
std::unique_lock<std::mutex> waitCondLock(m_queueLock);
|
|
while (true)
|
|
{
|
|
if (m_doShutdown)
|
|
return false;
|
|
|
|
if (!m_writerQueue.empty())
|
|
return true;
|
|
|
|
m_waitForDataCondition.wait(waitCondLock); // m_queueLock gets unlocked inside wait()
|
|
// m_queueLock is locked now
|
|
}
|
|
return true; // dead code ...
|
|
}
|
|
|
|
SampleWriterInterface *DataWriterTask::getNextSampleWriter()
|
|
{
|
|
std::lock_guard<std::mutex> lock(m_queueLock);
|
|
if (m_writerQueue.empty())
|
|
return nullptr;
|
|
|
|
TRACE_LOG(m_logger) << this << ": getData() queue size: " << m_writerQueue.size();
|
|
auto ret = m_writerQueue.front();
|
|
m_writerQueue.pop();
|
|
return ret;
|
|
}
|
|
|
|
void DataWriterTask::writeSamples()
|
|
{
|
|
while (true)
|
|
{
|
|
if (!waitForData())
|
|
return;
|
|
|
|
SampleWriterInterface *swi = nullptr;
|
|
while ((swi = getNextSampleWriter()) != nullptr)
|
|
{
|
|
swi->writeSamples();
|
|
TRACE_LOG(swi->logger()) << this << ": delete " << swi;
|
|
delete swi;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace RoutingService
|