torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
126 lines
3.7 KiB
C++
126 lines
3.7 KiB
C++
// **************************************************************************
|
|
//
|
|
// (C) Copyright 2009 Swiss SIMTEC AG
|
|
//
|
|
// **************************************************************************
|
|
//
|
|
// $HeadURL$
|
|
// $LastChangedBy$
|
|
// $LastChangedDate$
|
|
// $LastChangedRevision$
|
|
//
|
|
// Implementation of the Class PrtCnvThreadStarter
|
|
// **************************************************************************
|
|
#include "PrtCnvThreadStarter.hpp"
|
|
#include "PrtCnvCentralThread.hpp"
|
|
#include "PrtCnvRadioThread.hpp"
|
|
#include "PrtCnvDbThread.hpp"
|
|
#include "PrtCnvTelegramLogThread.hpp"
|
|
#include "PrtCnvInjectionThread.hpp"
|
|
#include "PrtCnvRadioTrafficThread.hpp"
|
|
#include "PrtCnvApplication.hpp"
|
|
|
|
namespace PrtCnv
|
|
{
|
|
|
|
// ---------------------------------------------------------------
|
|
// Constructor with id and ptr to main-app as parameters.
|
|
// ---------------------------------------------------------------
|
|
PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_ThreadId a_id,
|
|
const QString &configFileName,
|
|
PrtCnv::PrtCnvApplication* a_mainApp)
|
|
: m_Thread(nullptr)
|
|
, m_Application(a_mainApp)
|
|
, m_Id(a_id)
|
|
, m_settings(new NGL::Settings(configFileName))
|
|
, m_logger(getLogger("PrtCnvThreadStarter"))
|
|
{
|
|
DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
|
|
}
|
|
|
|
|
|
PrtCnvThreadStarter::~PrtCnvThreadStarter()
|
|
{
|
|
delete m_settings;
|
|
}
|
|
|
|
|
|
// ---------------------------------------------------------------
|
|
// The run()-function, which will be called by Qt-Framework,
|
|
// when starting the thread.
|
|
// ---------------------------------------------------------------
|
|
void PrtCnvThreadStarter::run()
|
|
{
|
|
INFO_LOG(m_logger) << "Entering event loop for thread " << this << ", id: " << m_Id;
|
|
// allocate the thread
|
|
switch (m_Id)
|
|
{
|
|
case PrtCnvApplication::e_Central:
|
|
m_Thread = new PrtCnvCentralThread(this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_Radio:
|
|
m_Thread = new PrtCnvRadioThread(m_Application->exerciseId(), this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_Db:
|
|
m_Thread = new PrtCnvDbThread(m_Application->databaseDriver(),
|
|
m_Application->databaseHostName(),
|
|
m_Application->databaseName(),
|
|
m_Application->databaseSchemaName(),
|
|
m_Application->databaseUserName(),
|
|
m_Application->databasePassword(),
|
|
this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_Log:
|
|
m_Thread = new PrtCnvTelegramLogThread(this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_Injection:
|
|
m_Thread = new PrtCnvInjectionThread(this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_RadioTraffic:
|
|
m_Thread = new PrtCnvRadioTrafficThread(this);
|
|
break;
|
|
|
|
case PrtCnvApplication::e_ThreadIdMax:
|
|
break;
|
|
}
|
|
|
|
if (!m_Thread)
|
|
{
|
|
ERROR_LOG(m_logger) << "Unknown threadId: " << m_Id;
|
|
return;
|
|
}
|
|
|
|
while (!m_Application)
|
|
sleep(1);
|
|
|
|
m_Application->waitForCreate(m_Id);
|
|
m_Thread->create(m_settings);
|
|
m_Application->waitForInit(m_Id);
|
|
m_Thread->init();
|
|
m_Application->waitForStart(m_Id);
|
|
m_Thread->start();
|
|
m_Application->waitForExec(m_Id);
|
|
|
|
exec();
|
|
|
|
INFO_LOG(m_logger) << "Leaving event loop for thread " << this << ", id: " << m_Id;
|
|
delete m_Thread;
|
|
m_Thread = nullptr;
|
|
}
|
|
|
|
|
|
// ---------------------------------------------------------------
|
|
// Returns the desired thread.
|
|
// ---------------------------------------------------------------
|
|
PrtCnvThread *PrtCnvThreadStarter::getOtherThread(PrtCnvApplication::E_ThreadId a_threadId) const
|
|
{
|
|
return m_Application->getThreadStarter(a_threadId)->m_Thread;
|
|
}
|
|
|
|
} // namespace PrtCnv
|