Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -15,10 +15,9 @@
namespace HighLevelArchitecture
{
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_exerciseId(0)
{}
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
MainHandler::~MainHandler()
{
@@ -50,7 +49,7 @@ bool MainHandler::init(int exerciseId)
int port = 23456;
if (!m_wsInterface->init(port))
{
ERROR_LOG() << Q_FUNC_INFO
ERROR_LOG(m_logger) << Q_FUNC_INFO
<< " WsInterface::init failed on port: " << port;
return false;
}
@@ -27,6 +27,7 @@ public:
private Q_SLOTS:
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<NgsHandler> m_ngsHandler;
std::shared_ptr<WsInterface> m_wsInterface;
int m_exerciseId;
@@ -130,8 +130,7 @@ static inline rpr2::EnvironmentObjectTypeStruct dummyEOS()
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
: m_ngsHandler(ngsHandler)
NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
, m_fedName(fedName)
, m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
, m_master(nullptr)
@@ -150,8 +149,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
, m_requestBiteReportCallback(new ObserverGuezRequestBiteReportCBNotifier())
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this))
{
, m_timer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -230,7 +229,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const ngs::NGSSimWorldException &e)
{
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
return false;
}
@@ -245,7 +244,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const NGSException &e)
{
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
return false;
}
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -295,27 +294,27 @@ void NgsConnector::subscribeAtNgs()
m_enitityNumberCounter = 1;
m_eventCount = 1;
INFO_LOG() << "Subscribe at NGS - Guez Human Objects";
INFO_LOG(m_logger) << "Subscribe at NGS - Guez Human Objects";
rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
humanObjClass.subscribeAllAttributes();
humanObjClass.subscribe();
INFO_LOG() << "Subscribe at NGS - Guez ObserverController Objects";
INFO_LOG(m_logger) << "Subscribe at NGS - Guez ObserverController Objects";
rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
observerControllerObjClass.subscribeAllAttributes();
observerControllerObjClass.subscribe();
INFO_LOG() << "Subscribe at NGS - Guez GroundVehicle Objects";
INFO_LOG(m_logger) << "Subscribe at NGS - Guez GroundVehicle Objects";
rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.subscribeAllAttributes();
groundVehicleObjClass.subscribe();
INFO_LOG() << "Subscribe at NGS - Guez MineField Objects";
INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Objects";
rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
minefieldObjClass.subscribeAllAttributes();
minefieldObjClass.subscribe();
INFO_LOG() << "Subscribe at NGS - Guez MineField Breach Objects";
INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Breach Objects";
rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
minefieldBreachObjClass.subscribeAllAttributes();
minefieldBreachObjClass.subscribe();
@@ -351,23 +350,23 @@ void NgsConnector::unsubscribeFromNgs()
if (m_somPlayer)
{
INFO_LOG() << "Unsubscribe at NGS - Guez Human Objects";
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez Human Objects";
rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
humanObjClass.unsubscribe();
INFO_LOG() << "Unsubscribe at NGS - Guez ObserverController Objects";
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez ObserverController Objects";
rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
observerControllerObjClass.unsubscribe();
INFO_LOG() << "Unsubscribe at NGS - Guez GroundVehicle Objects";
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez GroundVehicle Objects";
rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.unsubscribe();
INFO_LOG() << "Unsubscribe at NGS - Guez MineField Objects";
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Objects";
rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
minefieldObjClass.unsubscribe();
INFO_LOG() << "Unsubscribe at NGS - Guez MineField Breach Objects";
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Breach Objects";
rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
minefieldBreachObjClass.unsubscribe();
}
@@ -777,11 +776,11 @@ void NgsConnector::go()
}
catch (const NGSException &ex)
{
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
}
catch (const std::exception &e)
{
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
}
catch (...)
{
@@ -283,6 +283,7 @@ signals:
void newMinefieldBreach(AreaEffectSimulation::MineCorridorModifyRequest &mc);
protected:
NGL::INGLLogger &m_logger;
void subscribeAtNgs();
void unsubscribeFromNgs();
@@ -17,9 +17,8 @@
namespace HighLevelArchitecture
{
NgsHandler::NgsHandler(QObject *parent)
: QObject(parent)
{}
NgsHandler::NgsHandler(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
NgsHandler::~NgsHandler()
{
@@ -36,7 +35,7 @@ bool NgsHandler::init()
if (myVec < myVec2)
{
INFO_LOG() << "Protocol = ";
INFO_LOG(m_logger) << "Protocol = ";
}
@@ -50,7 +49,7 @@ bool NgsHandler::init()
ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
m_ngsConnector =
@@ -37,6 +37,7 @@ Q_SIGNALS:
private slots:
void onFirstTickFinished();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<NgsConnector> m_ngsConnector;
};
}
@@ -19,26 +19,25 @@ namespace HighLevelArchitecture
WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent)
: QObject(parent)
WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent) : QObject(parent)
, m_wsServer(new QWebSocketServer(QStringLiteral("GNA"), QWebSocketServer::NonSecureMode, this))
, m_ngsHandler(ngsHandler)
.getNGLLogger("HlaTestTool.WsInterface"))
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
.getNGLLogger("HlaTestTool.WsInterface")),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
WsInterface::~WsInterface()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
for (auto client : std::as_const(m_clients))
{
client->disconnect(this);
client->close();
}
qDeleteAll(m_clients);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool WsInterface::init(quint16 listenPort)
@@ -50,14 +49,14 @@ bool WsInterface::init(quint16 listenPort)
if (!m_wsServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG() << "Cannot listen on port " << listenPort << " - aborting";
WARNING_LOG(m_logger) << "Cannot listen on port " << listenPort << " - aborting";
return false;
}
DEBUG_LOG() << "Listening on port " << listenPort;
DEBUG_LOG(m_logger) << "Listening on port " << listenPort;
connect(m_wsServer, &QWebSocketServer::newConnection,
this, &WsInterface::onNewConnection);
TRACE_LOG() << Q_FUNC_INFO << " END, listenPort=" << listenPort;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, listenPort=" << listenPort;
return true;
}
@@ -79,19 +78,19 @@ void WsInterface::onNewConnection()
void WsInterface::onWebSocketDisconnected()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
if (!ws)
return;
NOTICE_LOG(m_logger) << "Websocket connection closed, ptr: " << ws;
m_clients.remove(ws);
ws->deleteLater();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void WsInterface::onError(QAbstractSocket::SocketError error)
{
ERROR_LOG() << Q_FUNC_INFO << " Error occured, QAbstractSocket::SocketError = " << error;
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error occured, QAbstractSocket::SocketError = " << error;
}
void WsInterface::onTextMessageReceived(const QString &msg)
@@ -100,15 +99,15 @@ void WsInterface::onTextMessageReceived(const QString &msg)
if (msg.isEmpty())
{
ERROR_LOG() << "Empty message received";
ERROR_LOG(m_logger) << "Empty message received";
return;
}
DEBUG_LOG() << "incoming telegram: " << msg;
DEBUG_LOG(m_logger) << "incoming telegram: " << msg;
const QByteArray baJson = msg.toUtf8();
processMessage(baJson);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void WsInterface::processMessage(const QByteArray baJson)
@@ -120,7 +119,7 @@ void WsInterface::processMessage(const QByteArray baJson)
if (parseError.error != QJsonParseError::NoError)
{
ERROR_LOG() << "Could not parse JSON "
ERROR_LOG(m_logger) << "Could not parse JSON "
<< ". Reason: "
<< parseError.errorString()
<< "; baJson: '"
@@ -156,7 +155,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG() << "Could not parse json telegram: "
ERROR_LOG(m_logger) << "Could not parse json telegram: "
<< ", error: " << ex.what();
}
break;
@@ -176,7 +175,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG() << "Could not parse json telegram: "
ERROR_LOG(m_logger) << "Could not parse json telegram: "
<< ", error: " << ex.what();
return;
}
@@ -206,7 +205,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG() << "Could not parse json telegram: "
ERROR_LOG(m_logger) << "Could not parse json telegram: "
<< ", error: " << ex.what();
return;
}
@@ -219,7 +218,7 @@ void WsInterface::processMessage(const QByteArray baJson)
default:
{
ERROR_LOG() << "Telegram with typeId '" << typeId << "' not handled in switch"
ERROR_LOG(m_logger) << "Telegram with typeId '" << typeId << "' not handled in switch"
<< ", doc= " << doc.toJson(QJsonDocument::Compact) << "<<<";
}
}
@@ -33,6 +33,8 @@ public:
signals:
private:
NGL::INGLLogger &m_logger;
QWebSocketServer *m_wsServer;
QSet<QWebSocket *> m_clients;