From 2c797ba65413291f436daab16d4c7c3e3d2515e0 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 28 Feb 2025 10:22:43 +0100 Subject: [PATCH] Refs #22841. Move `SharedMemTransportDescriptor` constants. Signed-off-by: Miguel Company --- .../shared_mem/SharedMemTransportDescriptor.hpp | 15 ++++++++++----- .../shared_mem/SharedMemTransportDescriptor.cpp | 8 -------- .../shared_mem/SharedMemTransportDescriptor.hpp | 12 ++++++++---- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp index 1f9c40fd089..322d7f1e3f8 100644 --- a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp +++ b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp @@ -20,6 +20,7 @@ #ifndef FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP #define FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP +#include #include #include @@ -48,6 +49,10 @@ class TransportInterface; */ struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor { + static constexpr uint32_t shm_default_segment_size = 0; + static constexpr uint32_t shm_default_port_queue_capacity = 512; + static constexpr uint32_t shm_default_healthy_check_timeout_ms = 1000; + //! Destructor virtual ~SharedMemTransportDescriptor() = default; @@ -154,13 +159,13 @@ struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor private: - uint32_t segment_size_; - uint32_t port_queue_capacity_; - uint32_t healthy_check_timeout_ms_; - std::string rtps_dump_file_; + uint32_t segment_size_ = shm_default_segment_size; + uint32_t port_queue_capacity_ = shm_default_port_queue_capacity; + uint32_t healthy_check_timeout_ms_ = shm_default_healthy_check_timeout_ms; + std::string rtps_dump_file_ {""}; //! Thread settings for the transport dump thread - ThreadSettings dump_thread_; + ThreadSettings dump_thread_ {}; }; diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp index a5e413c3961..84131aa00bf 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp @@ -23,19 +23,11 @@ namespace eprosima { namespace fastdds { namespace rtps { -static constexpr uint32_t shm_default_segment_size = 0; -static constexpr uint32_t shm_default_port_queue_capacity = 512; -static constexpr uint32_t shm_default_healthy_check_timeout_ms = 1000; - //********************************************************* // SharedMemTransportDescriptor //********************************************************* SharedMemTransportDescriptor::SharedMemTransportDescriptor() : PortBasedTransportDescriptor(shm_default_segment_size, s_maximumInitialPeersRange) - , segment_size_(shm_default_segment_size) - , port_queue_capacity_(shm_default_port_queue_capacity) - , healthy_check_timeout_ms_(shm_default_healthy_check_timeout_ms) - , rtps_dump_file_("") { maxMessageSize = s_maximumMessageSize; } diff --git a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp index 1d1d0d2b509..d428c5a7e60 100644 --- a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp +++ b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp @@ -37,8 +37,12 @@ class TransportInterface; * * @ingroup TRANSPORT_MODULE */ -typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor +struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor { + static constexpr uint32_t shm_default_segment_size = 0; + static constexpr uint32_t shm_default_port_queue_capacity = 512; + static constexpr uint32_t shm_default_healthy_check_timeout_ms = 1000; + virtual ~SharedMemTransportDescriptor() { @@ -130,9 +134,9 @@ typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescripto private: - uint32_t segment_size_; - uint32_t port_queue_capacity_; - uint32_t healthy_check_timeout_ms_; + uint32_t segment_size_ = shm_default_segment_size; + uint32_t port_queue_capacity_ = shm_default_port_queue_capacity; + uint32_t healthy_check_timeout_ms_ = shm_default_healthy_check_timeout_ms; std::string rtps_dump_file_; ThreadSettings dump_thread_;