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.6 KiB
C++
71 lines
1.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Handler which notifes the FTS-instances about new data
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <dds/core/cond/Condition.hpp>
|
|
#include <dds/core/cond/GuardCondition.hpp>
|
|
#include <dds/core/cond/WaitSet.hpp>
|
|
|
|
#include <future>
|
|
#include <map>
|
|
#include <DDS/Generic/ddsgen_export.h>
|
|
|
|
namespace NGL
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
|
|
namespace DDSGeneric
|
|
{
|
|
class DDSGEN_EXPORT WaitSetHandler final
|
|
{
|
|
public:
|
|
class CallbackInterface
|
|
{
|
|
public:
|
|
virtual ~CallbackInterface() = default;
|
|
virtual void dataAvailable() = 0;
|
|
};
|
|
|
|
WaitSetHandler();
|
|
~WaitSetHandler();
|
|
|
|
bool attachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb);
|
|
bool detachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb);
|
|
bool enableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb);
|
|
bool disableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb);
|
|
|
|
int attachedConditionCount() const;
|
|
|
|
private:
|
|
struct WaitSetData final
|
|
{
|
|
dds::core::cond::Condition condition;
|
|
CallbackInterface *callback = nullptr;
|
|
bool enabled = true;
|
|
bool needWaitSetAttach = false;
|
|
|
|
WaitSetData(const dds::core::cond::Condition &cond, CallbackInterface *cb)
|
|
: condition(cond)
|
|
, callback(cb)
|
|
{}
|
|
};
|
|
private:
|
|
void waitSetTask();
|
|
private:
|
|
|
|
dds::core::cond::WaitSet m_waitSet;
|
|
dds::core::cond::GuardCondition m_abortCondition;
|
|
std::future<void> m_task;
|
|
std::mutex m_accessMutex;
|
|
std::map<const DDS_Condition *, WaitSetData> m_waitSetData;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace DDSGeneric
|