lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
+21 -22
View File
@@ -34,7 +34,6 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
, m_failedStartAttemptCounter(0)
, m_stoppedFromRequest(false)
, m_pidProc(new QProcess(this))
, m_logger(getLogger("ServiceProcess"))
{
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
@@ -60,7 +59,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
#ifndef LTS_DEBUG
if (m_name == QStringLiteral("HighLevelArchitecture"))
{
DEBUG_LOG(m_logger) <<" START HLA REMOTE";
DEBUG_LOG() <<" START HLA REMOTE";
killallRemote();
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -74,7 +73,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
if (m_name == QStringLiteral("Buildings"))
{
DEBUG_LOG(m_logger) <<" START Buildings Remote";
DEBUG_LOG() <<" START Buildings Remote";
killallRemote();
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -117,7 +116,7 @@ Core::RunningState ServiceManagement::ServiceProcess::runningState() const
bool ServiceManagement::ServiceProcess::start(OpenMode mode)
{
DEBUG_LOG(m_logger) << "Starting ServiceProcess "
DEBUG_LOG() << "Starting ServiceProcess "
<< debugInfo()
<< " executable: " << program()
<< " in dir: " << workingDirectory()
@@ -130,10 +129,10 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
#ifndef LTS_DEBUG
if (m_name == QStringLiteral("HighLevelArchitecture"))
{
DEBUG_LOG(m_logger) <<" START HLA REMOTE";
DEBUG_LOG() <<" START HLA REMOTE";
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
//DEBUG_LOG(m_logger) << sshCmd;
//DEBUG_LOG() << sshCmd;
setProgram(QStringLiteral("ssh"));
if (state() == QProcess::NotRunning)
@@ -141,11 +140,11 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
QProcess::start(mode);
waitForStarted(5000);
}
DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG(m_logger) << sshCmd;
//DEBUG_LOG() << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
setProgram(QStringLiteral("ssh"));
@@ -170,26 +169,26 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->waitForReadyRead(5000);
});
DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
}else if (m_name == QStringLiteral("Buildings"))
{
DEBUG_LOG(m_logger) <<" START Buildings REMOTE";
DEBUG_LOG() <<" START Buildings REMOTE";
setProgram(QStringLiteral("ssh"));
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
//DEBUG_LOG(m_logger) << sshCmd;
//DEBUG_LOG() << sshCmd;
if (state() == QProcess::NotRunning)
{
QProcess::start(mode);
waitForStarted(5000);
}
DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG(m_logger) << sshCmd;
//DEBUG_LOG() << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
setProgram(QStringLiteral("ssh"));
@@ -216,7 +215,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->waitForReadyRead(5000);
});
DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
}
else
#endif
@@ -231,7 +230,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
}
else
{
ERROR_LOG(m_logger) << "Could not start service "
ERROR_LOG() << "Could not start service "
<< debugInfo()
<< " because there is no licence for it.";
return false;
@@ -245,7 +244,7 @@ int ServiceManagement::ServiceProcess::serviceProcessId() const
void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::CurrentRunningState &data)
{
DEBUG_LOG(m_logger) << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
DEBUG_LOG() << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
m_failedStartAttemptCounter = 0;
m_lastHeartbeatMSec = QDateTime::currentMSecsSinceEpoch();
m_runningState = data.runningState();
@@ -288,7 +287,7 @@ void ServiceManagement::ServiceProcess::killallRemote()
sh.startDetached();
#else
sh.start();
#endif DEBUG_LOG(m_logger) << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
#endif DEBUG_LOG() << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
}
void ServiceManagement::ServiceProcess::restart()
@@ -421,7 +420,7 @@ void ServiceManagement::ServiceProcess::setNewStateFromChangeRequest(const Core:
void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
{
DEBUG_LOG(m_logger) << "New state for " << debugInfo() << ": " << state;
DEBUG_LOG() << "New state for " << debugInfo() << ": " << state;
QString errString;
switch (state)
{
@@ -429,10 +428,10 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
if (exitStatus() == QProcess::NormalExit)
{
if (exitCode() == 0)
DEBUG_LOG(m_logger) << "Normal exit for " << debugInfo()
DEBUG_LOG() << "Normal exit for " << debugInfo()
<< ": " << readAllStandardError() << ", " << readAllStandardOutput();
else
ERROR_LOG(m_logger) << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
ERROR_LOG() << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
<< ": " << readAllStandardError() << ", " << readAllStandardOutput();
m_runningState = Core::RunningState::StoppedNormally;
}
@@ -453,7 +452,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
m_runningState = Core::RunningState::StoppedError;
}
errString += QLatin1String(" error string: ") + errorString();
ERROR_LOG(m_logger) << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
ERROR_LOG() << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
<< readAll();
}
m_parentService->licenceDonator()->freeLicence(m_name);
@@ -464,7 +463,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
m_runningState = Core::RunningState::Starting;
break;
case QProcess::Running:
DEBUG_LOG(m_logger) << "Process " << m_name
DEBUG_LOG() << "Process " << m_name
<< " has now the PID " << usablePid();
}