Refs #22841. Move SharedMemTransportDescriptor constants.

Signed-off-by: Miguel Company <[email protected]>
eProsima · Feb 28, 2025 · 2c797ba · 2c797ba
1 parent afb663d
commit 2c797ba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git 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 <cstdint>
 #include <string>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
@@ -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
@@ -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/...MemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp b/...MemTransportDescriptor/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_;