Document the Release 2 driver in the README and tidy DDS/Plugins

- Rewrite README.md around new_docker_build_release2.sh: Release 2
  scope (4 build groups, 61 targets), Ninja/RelWithDebInfo configure,
  the 22-test ctest baseline, DEB production via
  rpmbuild/make_rpm_ubuntu26_release2.py, options reference,
  troubleshooting and known quirks (the legacy validation-scope driver
  is no longer documented as the main flow).
- Remove leftover blank lines and stale explanatory comments in
  Lts/DDS/Generic (dynamic_data_reader.h, generic_base.h),
  Lts/DDS/QosProfile (DDS_DefaultQos.cpp/.h, CMakeLists.txt) and
  Lts/Plugins/CMakeLists.txt.
This commit is contained in:
berrux-dev committed 2026-11-17 20:14:47 +01:00
1 parent 84f8cfb41f
commit b18ac87565
7 files changed
+207 -233

No files matched your search

@@ -88,7 +88,6 @@ class DynamicDataReader final
try
{
const std::string topicName =
specialTopicName.empty() ? DDS::Helper::getShortTopicName(m_structType->name()) : specialTopicName;
@@ -117,20 +116,16 @@ class DynamicDataReader final
}
dds::sub::qos::DataReaderQos dataReaderQos = ddsSubscriber.default_datareader_qos();
QString typeName = QString::fromStdString(m_structType->name());
if (typeName.endsWith(QLatin1String("Request")) || typeName.endsWith(QLatin1String("Reply")))
{
dds::core::policy::Durability readerDurability;
dataReaderQos >> readerDurability;
readerDurability.kind(dds::core::policy::DurabilityKind_def::VOLATILE);
dataReaderQos << readerDurability;
}
m_dataReader =
DataReader(ddsSubscriber, m_ddsTopic, dataReaderQos, nullptr, dds::core::status::StatusMask::all());
m_dataReader = DataReader(ddsSubscriber, m_ddsTopic, dataReaderQos, nullptr, dds::core::status::StatusMask::all());
if (m_dataReader == nullptr)
{
ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '"
@@ -145,7 +140,6 @@ class DynamicDataReader final
}
DEBUG_LOG(m_logger) << "dataReader created (" << m_structType->name() << ")";
return true;
}
@@ -219,16 +213,13 @@ class DynamicDataReader final
}
auto copy = m_newSamplesDuringRead;
m_newSamplesDuringRead.clear();
for (auto& sample : copy)
{
readData(rti::sub::LoanedSample<DynamicData>(sample.sample, &sample.info), m_dataReader->topic_name(),
callbackFunc);
delete sample.sample;
}
return checkDisposedInstances(callbackFunc);
}
@@ -270,9 +261,7 @@ class DynamicDataReader final
SampleStruct ss;
ss.sample = new DynamicData(sample.data());
ss.info = sample.info();
m_newSamplesDuringRead.emplace_back(ss);
bSeenNewSamples = true;
}
}
@@ -297,7 +286,6 @@ class DynamicDataReader final
if (sample.info().valid())
readData(sample, m_dataReader->topic_name(), callbackFunc);
}
return true;
}
@@ -65,9 +65,6 @@ namespace Helper
{
DDSGEN_EXPORT std::string getFunctionTopicName(const std::string &fqName);
DDSGEN_EXPORT std::string getShortTopicName(const std::string &fqName);
DDSGEN_EXPORT QMetaMethod getMethod(NGL::INGLLogger &logger,
QObject *objectToInform,
const char *slotToExecute,
@@ -25,11 +25,6 @@ NGL_ADD_LIBRARY2(AAR SV HLA WS ddsQoS SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(ddsQoS
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../../
# Consumers (the generated *_topic_type_plugin.cpp) include
# DDS_DefaultQos.h -> ddsqos_export.h; the export header is generated
# into the binary dir, so export it the same way ddsfts exports its
# ddsfts_export.h. Without this every <svc>TopicTypePlugin target fails
# to compile ("ddsqos_export.h: No such file or directory").
${CMAKE_CURRENT_BINARY_DIR}
)
NGL_TARGET_LINK_LIBRARIES(ddsQoS
@@ -7,9 +7,7 @@
*/
#include "DDS_DefaultQos.h"
#include <QtCore/QUrl>
#include <ngltools/ngltools_filesystem.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -41,7 +39,6 @@ bool setDefault(const QStringList &qosFileList)
try
{
dds::core::StringSeq urls;
urls.reserve(qosStr.size());
for (const QString &file : qosStr)
@@ -54,9 +51,7 @@ bool setDefault(const QStringList &qosFileList)
rti::core::QosProviderParams qosProviderParams = defaultProvider->default_provider_params();
qosProviderParams.url_profile(urls);
defaultProvider->default_provider_params(qosProviderParams);
print(defaultProvider, logger);
}
catch (const dds::core::Exception &ex)
{
@@ -68,7 +63,6 @@ bool setDefault(const QStringList &qosFileList)
static QString fixupSchemeName(const QUrl &url)
{
QString str = url.toString();
str = str.replace(QLatin1String("tcpv4lan"), QLatin1String("tcpv4_lan"));
return QStringLiteral("0@") + str;
@@ -105,7 +99,6 @@ dds::domain::qos::DomainParticipantQos domainParticipantDefault(ConnectionType t
dpQos = defaultProvider.participant_qos("LtsProfiles::DomainParticipant.Tcp");
if (tcpConnectionUrl.scheme() == QLatin1String("tcpv4lan"))
{
rti::core::policy::Discovery discovery;
dpQos >> discovery;
const dds::core::StringSeq seq({fixupSchemeName(tcpConnectionUrl).toStdString()});
@@ -114,7 +107,6 @@ dds::domain::qos::DomainParticipantQos domainParticipantDefault(ConnectionType t
}
else
{
rti::core::policy::Property props;
dpQos >> props;
props.set({"dds.transport.TCPv4.tcp1.server_bind_port", std::to_string(tcpConnectionUrl.port(7400))});
@@ -201,36 +193,24 @@ dds::sub::qos::DataReaderQos dataReaderDefault( ConnectionType conType)
default:
break;
}
return drQos;
}
void print(dds::core::QosProvider provider, NGL::INGLLogger &logger)
{
print(provider.participant_qos(), logger);
print(provider.datawriter_qos(), logger);
print(provider.datareader_qos(), logger);
}
void print(const dds::domain::qos::DomainParticipantQos &qos, NGL::INGLLogger &logger)
{
DEBUG_LOG(logger) << "Qos for DomainParticipant: ";
printPolicyMap(qos->property.get_all(), logger);
}
void print(const dds::sub::qos::DataReaderQos &readerQos, NGL::INGLLogger &logger)
{
DEBUG_LOG(logger) << "Qos for dataReader: ";
DEBUG_LOG(logger) << "resourceLimit.max_samples " << readerQos->resource_limits.max_samples();
printPolicyMap(readerQos->property.get_all(), logger);
@@ -238,7 +218,6 @@ void print(const dds::sub::qos::DataReaderQos &readerQos, NGL::INGLLogger &logge
void print(const dds::pub::qos::DataWriterQos &writerQos, NGL::INGLLogger &logger)
{
DEBUG_LOG(logger) << "Default Qos for dataWriter: ";
DEBUG_LOG(logger) << "ReliabilityKind: " << writerQos->reliability->kind();
DEBUG_LOG(logger) << "Publish mode: " << writerQos->publish_mode.kind();
@@ -47,8 +47,6 @@ DDSQOS_EXPORT dds::pub::qos::DataWriterQos dataWriterDefault(TopicType type);
DDSQOS_EXPORT dds::sub::qos::DataReaderQos dataReaderDefault(TopicType type);
DDSQOS_EXPORT dds::sub::qos::DataReaderQos dataReaderDefault(ConnectionType conType);
DDSQOS_EXPORT dds::domain::qos::DomainParticipantQos domainParticipantShmUdp();
DDSQOS_EXPORT dds::domain::qos::DomainParticipantQos domainParticipantShmUdpLocalhost();
DDSQOS_EXPORT dds::domain::qos::DomainParticipantQos domainParticipantShm();
@@ -6,9 +6,6 @@
# Add Services directory to include path for all plugins
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Services/)
# (Stale include_directories for Release-2-pruned modules - AudioVideoManagement,
# GuezNasat, Viewer/LtsDataView, OperatorManagement, TopicEditorBase - removed:
# the paths no longer exist and only produced -Wmissing-include-dirs warnings.)
# Add NGLLogger stub headers
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/NGLLogger/)
# Add LtsSession stub headers