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>
142 lines
5.1 KiB
C++
142 lines
5.1 KiB
C++
/**
|
|
* DdsHandler for DDS
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2016-01-13
|
|
*/
|
|
|
|
#include "dds_handler.h"
|
|
|
|
#include <DDS/DTS/generic_dts_impl.h>
|
|
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
|
#include <QVector>
|
|
|
|
namespace SituationReplay
|
|
{
|
|
|
|
static std::shared_ptr<DDSConnector::DdsConnector> makeConnector(const ConnectionParams ¶ms,
|
|
IDL::PartitionType partitionType,
|
|
DDS::QosProfile::ConnectionType defaultConnectionType)
|
|
{
|
|
if (params.discoveryPeer.isEmpty())
|
|
return std::make_shared<DDSConnector::DdsConnector>(params.domainId,
|
|
partitionType,
|
|
params.partitionId,
|
|
params.exerciseId,
|
|
defaultConnectionType);
|
|
return std::make_shared<DDSConnector::DdsConnector>(params.domainId,
|
|
partitionType,
|
|
params.partitionId,
|
|
params.exerciseId,
|
|
params.discoveryPeer);
|
|
}
|
|
|
|
DdsHandler::DdsHandler(const ConnectionParams &output)
|
|
: m_ddsConnectorReplay(makeConnector(output, IDL::PartitionType::Replay, DDS::QosProfile::ConnectionType::ShmUdpLocalhost))
|
|
, m_logger(getLogger("DdsHandler"))
|
|
{
|
|
DEBUG_LOG(m_logger) << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
|
|
}
|
|
|
|
DdsHandler::DdsHandler(const ConnectionParams &input, const ConnectionParams &output)
|
|
: m_ddsConnectorExercise(makeConnector(input, IDL::PartitionType::Exercise, DDS::QosProfile::ConnectionType::Client))
|
|
, m_ddsConnectorReplay(makeConnector(output, IDL::PartitionType::Replay, DDS::QosProfile::ConnectionType::Shm))
|
|
, m_logger(getLogger("DdsHandler"))
|
|
{
|
|
DEBUG_LOG(m_logger) << "DdsHandler Exercise(" << input.partitionId << ") for partition: " << m_ddsConnectorExercise->getDefaultPartition();
|
|
DEBUG_LOG(m_logger) << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
|
|
}
|
|
|
|
DdsHandler::~DdsHandler()
|
|
{
|
|
m_sessionRouting = nullptr;
|
|
m_dtsPartitionTime = nullptr;
|
|
m_ddsFts = nullptr;
|
|
m_ddsDts = nullptr;
|
|
m_ddsConnectorReplay = nullptr;
|
|
m_ddsConnectorExercise = nullptr;
|
|
}
|
|
|
|
bool DdsHandler::init(const QStringList &qosFileList)
|
|
{
|
|
if ((m_ddsConnectorExercise && !m_ddsConnectorExercise->init(qosFileList)) ||
|
|
!m_ddsConnectorReplay->init(qosFileList))
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
|
return false;
|
|
}
|
|
|
|
if (m_ddsConnectorExercise)
|
|
{
|
|
m_ddsConnectorExercise->initPublisherSubscriber();
|
|
m_ddsConnectorExercise->enableBatchedWriter(false);
|
|
}
|
|
|
|
m_ddsConnectorReplay->initPublisherSubscriber();
|
|
m_ddsConnectorReplay->enableBatchedWriter(false);
|
|
|
|
m_dtsPartitionTime.reset(m_ddsConnectorReplay->createDTS<DTS::PartitionTimeImpl>());
|
|
assert(m_dtsPartitionTime.get());
|
|
|
|
m_ddsDts = SituationReplay::Interface::Dts::create(m_ddsConnectorReplay);
|
|
m_ddsFts = SituationReplay::Interface::Fts::create(m_ddsConnectorReplay);
|
|
bool bRet = m_ddsDts->enableAll();
|
|
INFO_LOG(m_logger) << "Dts initialised";
|
|
|
|
bRet &= m_ddsFts->enableAll();
|
|
INFO_LOG(m_logger) << "Fts initialised";
|
|
|
|
initReplayRouting();
|
|
|
|
return bRet;
|
|
}
|
|
|
|
void DdsHandler::publishPartitionTime(const Core::PartitionTime &partitionTime)
|
|
{
|
|
INFO_LOG(m_logger) << "publish partitionTime: " << partitionTime.timeStamp();
|
|
m_dtsPartitionTime->write(partitionTime);
|
|
}
|
|
|
|
bool DdsHandler::parseOptions(const QString &opts, ConnectionParams ¶ms)
|
|
{
|
|
QVector<QStringRef> parts = opts.splitRef(QLatin1Char(','));
|
|
if (parts.size() < 2 || parts.size() > 3)
|
|
return false;
|
|
bool bOk;
|
|
params.domainId = parts.at(0).toInt(&bOk);
|
|
if (!bOk)
|
|
return false;
|
|
params.partitionId = parts.at(1).toInt(&bOk);
|
|
if (!bOk)
|
|
return false;
|
|
if (parts.size() == 3)
|
|
{
|
|
QString str = parts.at(2).toString();
|
|
// '_' is not allowed in a scheme, but rti needs it ...
|
|
str.replace(QLatin1String("tcpv4_lan"), QLatin1String("tcpv4lan"));
|
|
QUrl url = QUrl::fromUserInput(str);
|
|
if (url.scheme() == QLatin1String("http") ||
|
|
url.scheme() == QLatin1String("file"))
|
|
url.setScheme(QStringLiteral("tcpv4lan"));
|
|
if (!url.isValid())
|
|
return false;
|
|
params.discoveryPeer = url;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void DdsHandler::initReplayRouting()
|
|
{
|
|
if (!m_ddsConnectorExercise)
|
|
return;
|
|
m_sessionRouting.reset(new RoutingService::SessionHandler(IDL::PartitionType::Replay,
|
|
m_ddsConnectorExercise,
|
|
m_ddsConnectorReplay));
|
|
m_sessionRouting->init();
|
|
m_sessionRouting->onCreateSession(QString::fromStdString(m_ddsConnectorExercise->getDefaultPartition()),
|
|
QString::fromStdString(m_ddsConnectorReplay->getDefaultPartition()));
|
|
}
|
|
|
|
} // Namespace SRP
|