Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -24,7 +24,6 @@ GroupHandler::GroupHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, m_serviceDonator(donator)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_heartbeatListener(new HeartbeatListener(ddsHandler->connector(), donator))
|
||||
, m_logger(getLogger("GroupHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -41,15 +40,15 @@ GroupHandler::~GroupHandler()
|
||||
|
||||
bool GroupHandler::init(int32_t coreDomain)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Initializing GroupHandler ...";
|
||||
DEBUG_LOG() << "Initializing GroupHandler ...";
|
||||
|
||||
bool bAllPartsInitialized = m_heartbeatListener->init() &&
|
||||
startGroupCore(coreDomain);
|
||||
|
||||
if (bAllPartsInitialized)
|
||||
DEBUG_LOG(m_logger) << "GroupHandler successfully initialized.";
|
||||
DEBUG_LOG() << "GroupHandler successfully initialized.";
|
||||
else
|
||||
ERROR_LOG(m_logger) << "GroupHandler initialization failed.";
|
||||
ERROR_LOG() << "GroupHandler initialization failed.";
|
||||
|
||||
return bAllPartsInitialized;
|
||||
}
|
||||
@@ -138,14 +137,14 @@ bool GroupHandler::startGroupCore(int32_t domainId)
|
||||
{
|
||||
if (domainId != m_ddsHandler->connector()->getDomainId())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not start group Core for domain "
|
||||
ERROR_LOG() << "Could not start group Core for domain "
|
||||
<< domainId
|
||||
<< ", this ServiceManagement instance only supports domain "
|
||||
<< m_ddsHandler->connector()->getDomainId();
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Starting core group ...";
|
||||
DEBUG_LOG() << "Starting core group ...";
|
||||
|
||||
GroupRequest groupToSearch;
|
||||
groupToSearch.type(Core::ServiceGroupType::Core);
|
||||
@@ -158,7 +157,7 @@ bool GroupHandler::startGroupCore(int32_t domainId)
|
||||
|
||||
if (coreScheme == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not start core group because there are no services linked to it";
|
||||
ERROR_LOG() << "Could not start core group because there are no services linked to it";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -175,7 +174,7 @@ void GroupHandler::onStartGroupRequest(const rti::core::SampleIdentity &cookie,
|
||||
{
|
||||
auto ret = onStartGroup(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->startGroupReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -183,13 +182,13 @@ void GroupHandler::slotStartGroupRequest(const GroupRequest &request)
|
||||
{
|
||||
auto ret = onStartGroup(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
emit startGroupReply(ret);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New StartGroupRequest: " << request;
|
||||
DEBUG_LOG() << "New StartGroupRequest: " << request;
|
||||
|
||||
if (request.domainId() != m_ddsHandler->connector()->getDomainId())
|
||||
return Core::FunctionReplyObject(request.requestId(),
|
||||
@@ -220,7 +219,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
|
||||
// if there is a similar group, we should take the services from there (to avoid restarting services on exeuction -> pause or pause -> resume)
|
||||
if (similarGroup)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Taking existing services from group " << similarGroup->type()
|
||||
DEBUG_LOG() << "Taking existing services from group " << similarGroup->type()
|
||||
<< " to " << existingGroup->type();
|
||||
existingGroup->takeServicesFromGroup(similarGroup);
|
||||
similarGroup->stop();
|
||||
@@ -236,7 +235,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
|
||||
|
||||
Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int exercisePartitionId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
|
||||
DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
|
||||
QVector<Group *> stillAliveGroups;
|
||||
|
||||
int cntStopped = 0;
|
||||
@@ -258,7 +257,7 @@ Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int e
|
||||
}
|
||||
|
||||
m_groups = stillAliveGroups;
|
||||
DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
|
||||
DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
|
||||
<< " - done. Stopped " << cntStopped << " groups"
|
||||
<< ", still alive: " << cntAlive;
|
||||
return Core::FunctionReplyObject(exercisePartitionId);
|
||||
@@ -268,7 +267,7 @@ void GroupHandler::onStopGroupRequest(const rti::core::SampleIdentity &cookie, c
|
||||
{
|
||||
auto ret = onStopGroup(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->stopGroupReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -276,13 +275,13 @@ void GroupHandler::slotStopGroupRequest(const GroupRequest &request)
|
||||
{
|
||||
auto ret = onStopGroup(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
emit stopGroupReply(ret);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject GroupHandler::onStopGroup(const GroupRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New StopGroupRequest: " << request;
|
||||
DEBUG_LOG() << "New StopGroupRequest: " << request;
|
||||
|
||||
Group *existingGroup = getGroup(request);
|
||||
|
||||
@@ -304,13 +303,13 @@ void GroupHandler::onRestartGroupRequest(const rti::core::SampleIdentity &cookie
|
||||
{
|
||||
auto ret = onRestartGroup(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->restartGroupReply(cookie, ret);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject GroupHandler::onRestartGroup(const GroupRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New RestartGroupRequest: " << request;
|
||||
DEBUG_LOG() << "New RestartGroupRequest: " << request;
|
||||
|
||||
Group *existingGroup = getGroup(request);
|
||||
|
||||
|
||||
Reference in new issue
Block a user