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>
59 lines
1.6 KiB
C++
59 lines
1.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Routing Test - handle a session (connection to and from sv for a specific partition)
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
|
|
#include "session.h"
|
|
|
|
namespace RoutingService
|
|
{
|
|
Session::Session(const QString &partitionNameSv, const QString &partitionNameWs)
|
|
: m_partitionNameSv(partitionNameSv.toStdString())
|
|
, m_partitionNameWs(partitionNameWs.toStdString())
|
|
, m_logger(getLogger("Session"))
|
|
{}
|
|
|
|
Session::~Session()
|
|
{
|
|
shutdown();
|
|
}
|
|
|
|
bool Session::init(const dds::domain::DomainParticipant &dpIn,
|
|
const dds::domain::DomainParticipant &dpOut,
|
|
const std::vector<TopicDispatcherInterface *> &topicsToRouteToWs,
|
|
const std::vector<TopicDispatcherInterface *> &topicsToRouteToSv)
|
|
{
|
|
DEBUG_LOG(m_logger) << "Creating new session for " << m_partitionNameSv << "-" << m_partitionNameWs;
|
|
|
|
m_connectionSvToWs.reset(new Connection(dpIn, m_partitionNameSv, topicsToRouteToWs, "route to WS"));
|
|
m_connectionWsToSv.reset(new Connection(dpOut, m_partitionNameWs, topicsToRouteToSv, "route from WS"));
|
|
|
|
m_connectionSvToWs->setOutput(m_connectionWsToSv.get());
|
|
m_connectionWsToSv->setOutput(m_connectionSvToWs.get());
|
|
|
|
return m_connectionSvToWs->initialize() && m_connectionWsToSv->initialize();
|
|
}
|
|
|
|
|
|
void Session::shutdown()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Shutting down session for " << m_partitionNameSv << "-" << m_partitionNameWs;
|
|
if (m_connectionSvToWs)
|
|
{
|
|
m_connectionSvToWs->shutdown();
|
|
m_connectionSvToWs = nullptr;
|
|
}
|
|
if (m_connectionWsToSv)
|
|
{
|
|
m_connectionWsToSv->shutdown();
|
|
m_connectionWsToSv = nullptr;
|
|
}
|
|
}
|
|
|
|
|
|
} // namespace RoutingService
|