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>
71 lines
1.8 KiB
C++
71 lines
1.8 KiB
C++
/**
|
|
* The ServiceHandler class handles all service related classes and writes the services state to DDS.
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hannes Baeuerle, SLSE, 2016-02-15
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QSet>
|
|
#include <QVector>
|
|
|
|
#include "logger.h"
|
|
#include "service_donator.h"
|
|
#include <ServiceManagement/scm_fts.h>
|
|
|
|
class QTimer;
|
|
|
|
namespace ServiceManagement
|
|
{
|
|
class DdsHandler;
|
|
class LicenceDonator;
|
|
class Service;
|
|
class ServiceInformation;
|
|
class ServiceProcess;
|
|
|
|
class ServiceHandler final
|
|
: public ServiceDonator
|
|
, protected Interface::Fts::RestartServiceRequestHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ServiceHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<LicenceDonator> &licenceDonator);
|
|
~ServiceHandler();
|
|
|
|
bool init();
|
|
void addService(Service *service);
|
|
|
|
ServiceProcess *getProcess(int serviceId, const GroupRequest &groupData) override final;
|
|
|
|
void onRestartServiceRequest(const rti::core::SampleIdentity &cookie,
|
|
const RestartServiceRequest &request) override final;
|
|
|
|
void stopAllServices();
|
|
|
|
|
|
private Q_SLOTS:
|
|
void onNewServiceInfoFromProc(const ServiceInformation &info);
|
|
void onNewServiceInfoFromDds(const Core::CurrentRunningState &data, DataModification type) override final;
|
|
void onHeartBeatObserverTimerTimeout();
|
|
|
|
private: // methods
|
|
Service *serviceFromId(int id);
|
|
ServiceProcess *serviceProcessFromPid(qint64 pid);
|
|
ServiceProcess *serviceProcessFromServiceProcId(int32_t id);
|
|
|
|
private: // attributes
|
|
QVector<Service *> m_services;
|
|
QTimer *m_heartBeatObserverTimer;
|
|
std::shared_ptr<DdsHandler> m_ddsHandler;
|
|
std::shared_ptr<LicenceDonator> m_licenceDonator;
|
|
|
|
int HEARTBEAT_OBSERVER_INTERVAL = 10000;
|
|
QSet<qint64> m_unknownPidsWarned;
|
|
|
|
LOGGER_T m_logger;
|
|
};
|
|
} // namespace ServiceManagement
|