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

@@ -20,7 +20,7 @@ namespace XxxXxxXxx
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::FIXME, exerciseId))
{
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
DdsHandler::~DdsHandler()
@@ -30,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
{
if(!m_ddsConnector->init(qosFileList))
{
ERROR_LOG() << "Error initializing dds connections - aborting";
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
return false;
}
@@ -46,10 +46,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ddsFts = XxxXxxXxx::Interface::Fts::create(m_ddsConnector);
bool bRet = m_ddsDts->enableAll();
INFO_LOG() << "Dts initialised";
INFO_LOG(m_logger) << "Dts initialised";
bRet &= m_ddsFts->enableAll();
INFO_LOG() << "Fts initialised";
INFO_LOG(m_logger) << "Fts initialised";
// TODO: call at the end of main_handler init:
//m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
@@ -45,6 +45,7 @@ public:
}
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<DTS::CurrentRunningState> m_dtsCurrentRunningState;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
@@ -13,11 +13,10 @@
namespace XxxXxxXxx
{
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_ddsHandler(nullptr)
, m_dbHandler(nullptr)
{}
, m_dbHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
MainHandler::~MainHandler()
{
@@ -33,19 +32,19 @@ bool MainHandler::init(int domainId)
if (!m_dbHandler->init(0, Settings::settings(), m_logger))
{
ERROR_LOG() << "Initialisation dbHandler failed.";
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
return false;
}
DEBUG_LOG() << "Initialisation dbHandler succesful.";
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
if (!m_ddsHandler->init())
{
ERROR_LOG() << "Initialisation ddsHandler failed.";
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
return false;
}
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
// TODO
@@ -33,6 +33,7 @@ public:
std::shared_ptr<DatabaseInterface> db() const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
};
@@ -20,11 +20,10 @@ namespace YyyYyyYyy
HandlerXxx::HandlerXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent)
: QObject(parent)
QObject *parent) : QObject(parent)
, m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler)
{}
, m_dbHandler(dbHandler),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
HandlerXxx::~HandlerXxx()
{}
@@ -35,7 +34,7 @@ bool HandlerXxx::init()
// read all Xxxs from database
if(!m_dbHandler->db()->select(dataVec))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -47,13 +46,13 @@ bool HandlerXxx::init()
if(ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
return false;
}
m_xxxObjMap.insert(ifs->getId(), ifs);
}
DEBUG_LOG() << "m_exeObjMap.size() = " << m_xxxObjMap.size();
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_xxxObjMap.size();
return true;
}
@@ -29,7 +29,9 @@ public:
private:
NGL::INGLLogger &m_logger;
private:
NGL::INGLLogger &m_logger;
QMap<int, ObjectXxx*> m_xxxObjMap;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
@@ -56,11 +56,11 @@ void ObjectXxx::onPublishData()
ddsData.id(m_data.id);
// Todo: Copy as above
INFO_LOG() << "Publish YyyXxx-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish YyyXxx-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
{
ERROR_LOG() << "Error publishing YyyXxx-data to dds";
ERROR_LOG(m_logger) << "Error publishing YyyXxx-data to dds";
}
}
@@ -39,6 +39,8 @@ namespace YyyYyyYyy
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
Database::YyyXxx m_data;