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.9 KiB
C++
106 lines
2.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Routing Test - Watch for Exercises and create routes
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "partition_handler.h"
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
|
|
namespace RoutingService
|
|
{
|
|
PartitionHandler::PartitionHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, QObject *parent)
|
|
: QObject(parent)
|
|
, m_exmDtc(ExerciseManagement::Interface::Dtc::create(ddsConnector))
|
|
, m_destroyTimer(new QTimer(this))
|
|
, m_logger(getLogger("PartitionHandler"))
|
|
{
|
|
m_exmDtc->enableExercise();
|
|
|
|
m_destroyTimer->setInterval(1000);
|
|
m_destroyTimer->setSingleShot(false);
|
|
|
|
connect(m_destroyTimer, &QTimer::timeout, this, &PartitionHandler::onDestroyTimerTimeout);
|
|
}
|
|
|
|
PartitionHandler::~PartitionHandler()
|
|
{
|
|
qDeleteAll(m_destroyMap);
|
|
}
|
|
|
|
bool PartitionHandler::init()
|
|
{
|
|
connect(m_exmDtc.get(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
|
|
this, &PartitionHandler::onExerciseChanged);
|
|
|
|
m_exmDtc->exercises([this](const ExerciseManagement::Exercise &exercise) {onExerciseChanged(exercise, DataModification::eAdded);});
|
|
return true;
|
|
}
|
|
|
|
void PartitionHandler::partitionModified(const QString &partitionName, const ExerciseManagement::ExerciseState &state)
|
|
{
|
|
if (state == ExerciseManagement::ExerciseState::Unknown ||
|
|
state == ExerciseManagement::ExerciseState::Terminated)
|
|
{
|
|
partitionRemoved(partitionName);
|
|
return;
|
|
}
|
|
|
|
m_destroyMap.remove(partitionName);
|
|
auto it = m_activeSessions.find(partitionName);
|
|
if (it != m_activeSessions.end())
|
|
return;
|
|
m_activeSessions.insert(partitionName);
|
|
if (!m_destroyTimer->isActive())
|
|
m_destroyTimer->start();
|
|
|
|
emit createSession(partitionName, partitionName);
|
|
}
|
|
|
|
void PartitionHandler::partitionRemoved(const QString &partitionName)
|
|
{
|
|
QElapsedTimer *et = new QElapsedTimer;
|
|
et->start();
|
|
m_destroyMap.insert(partitionName, et);
|
|
}
|
|
|
|
void PartitionHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
|
|
{
|
|
const QString partitionName(QString::fromStdString(DDSConnector::DdsConnector::getPartitionString(IDL::PartitionType::Exercise, data.id())));
|
|
DEBUG_LOG(m_logger) << "onExerciseChanged: " << data << ", modType: " << modType;
|
|
switch (modType)
|
|
{
|
|
case DataModification::eRemoved:
|
|
partitionRemoved(partitionName);
|
|
break;
|
|
case DataModification::eAdded:
|
|
case DataModification::eModified:
|
|
partitionModified(partitionName, data.state());
|
|
break;
|
|
}
|
|
}
|
|
|
|
void PartitionHandler::onDestroyTimerTimeout()
|
|
{
|
|
auto it = m_destroyMap.begin();
|
|
while (it != m_destroyMap.end())
|
|
{
|
|
QElapsedTimer *et = it.value();
|
|
if (et->elapsed() < 5 * 1000)
|
|
{
|
|
++it;
|
|
continue;
|
|
}
|
|
DEBUG_LOG(m_logger) << "onDestroyTimerTimeout for session " << it.key() << " triggered";
|
|
delete et;
|
|
m_activeSessions.remove(it.key());
|
|
emit destroySession(it.key(), it.key());
|
|
it = m_destroyMap.erase(it);
|
|
}
|
|
}
|
|
|
|
|
|
} // namespace RoutingService
|