From 35801b58b009b5dc14604f542d6a7ddf5c6c7a01 Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Mon, 1 Apr 2024 10:17:38 +0200 Subject: [PATCH 1/3] Refs #20714: refactor statistics module IDL Signed-off-by: JLBuenoLopez-eProsima --- include/fastdds/statistics/types.idl | 73 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/include/fastdds/statistics/types.idl b/include/fastdds/statistics/types.idl index 907a62d2544..ddf62fb44ff 100644 --- a/include/fastdds/statistics/types.idl +++ b/include/fastdds/statistics/types.idl @@ -119,54 +119,53 @@ struct PhysicalData string process; }; -@bit_bound(32) -bitmask EventKind +module EventKind { - @position(0) HISTORY2HISTORY_LATENCY, - @position(1) NETWORK_LATENCY, - @position(2) PUBLICATION_THROUGHPUT, - @position(3) SUBSCRIPTION_THROUGHPUT, - @position(4) RTPS_SENT, - @position(5) RTPS_LOST, - @position(6) RESENT_DATAS, - @position(7) HEARTBEAT_COUNT, - @position(8) ACKNACK_COUNT, - @position(9) NACKFRAG_COUNT, - @position(10) GAP_COUNT, - @position(11) DATA_COUNT, - @position(12) PDP_PACKETS, - @position(13) EDP_PACKETS, - @position(14) DISCOVERED_ENTITY, - @position(15) SAMPLE_DATAS, - @position(16) PHYSICAL_DATA + const unsigned long HISTORY2HISTORY_LATENCY = 1; + const unsigned long NETWORK_LATENCY = 2; + const unsigned long PUBLICATION_THROUGHPUT = 4; + const unsigned long SUBSCRIPTION_THROUGHPUT = 8; + const unsigned long RTPS_SENT = 16; + const unsigned long RTPS_LOST = 32; + const unsigned long RESENT_DATAS = 64; + const unsigned long HEARTBEAT_COUNT = 128; + const unsigned long ACKNACK_COUNT = 256; + const unsigned long NACKFRAG_COUNT = 512; + const unsigned long GAP_COUNT = 1024; + const unsigned long DATA_COUNT = 2048; + const unsigned long PDP_PACKETS = 4096; + const unsigned long EDP_PACKETS = 8192; + const unsigned long DISCOVERED_ENTITY = 16384; + const unsigned long SAMPLE_DATAS = 32768; + const unsigned long PHYSICAL_DATA = 65536; }; -union Data switch(EventKind) +union Data switch(unsigned long) { - case HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: WriterReaderData writer_reader_data; - case NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: Locator2LocatorData locator2locator_data; - case PUBLICATION_THROUGHPUT: - case SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: EntityData entity_data; - case RTPS_SENT: - case RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: Entity2LocatorTraffic entity2locator_traffic; - case RESENT_DATAS: - case HEARTBEAT_COUNT: - case ACKNACK_COUNT: - case NACKFRAG_COUNT: - case GAP_COUNT: - case DATA_COUNT: - case PDP_PACKETS: - case EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: EntityCount entity_count; - case DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: DiscoveryTime discovery_time; - case SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: SampleIdentityCount sample_identity_count; - case PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: PhysicalData physical_data; }; From 0bbc08dd669dd6ebd4ee50d09929f67c1cbf177b Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Mon, 1 Apr 2024 10:28:59 +0200 Subject: [PATCH 2/3] Refs #20714: regenerate types Signed-off-by: JLBuenoLopez-eProsima --- .../AdvancedConfiguration.h | 1 + .../AdvancedConfigurationv1.h | 2 + .../BasicConfigurationExample/HelloWorld.h | 1 + .../ContentFilteredTopicExample/HelloWorld.h | 1 + .../CustomPayloadPoolData.h | 1 + .../DeadlineQoSExample/deadlinepayloadv1.cxx | 6 +- .../DiscoveryServerExample/types/HelloWorld.h | 1 + examples/cpp/dds/Filtering/FilteringExample.h | 1 + .../FlowControlExample/FlowControlExample.h | 1 + .../cpp/dds/HelloWorldExample/HelloWorld.h | 1 + .../cpp/dds/HelloWorldExample/HelloWorldv1.h | 2 + .../HelloWorldExampleSharedMem/HelloWorld.h | 1 + .../OwnershipStrength.h | 1 + .../cpp/dds/RequestReplyExample/Calculator.h | 1 + .../dds/SecureHelloWorldExample/HelloWorld.h | 1 + .../dds/StaticHelloWorldExample/HelloWorld.h | 1 + .../WriterLoansExample/LoanableHelloWorld.h | 1 + .../dds/ZeroCopyExample/LoanableHelloWorld.h | 1 + .../LoanableHelloWorldPubSubTypes.h | 2 +- .../types/monitorservice_typesPubSubTypes.h | 891 ++++---- .../types/monitorservice_typesv1.cxx | 1 - .../statistics/types/monitorservice_typesv1.h | 19 +- src/cpp/statistics/types/types.cxx | 349 ++-- src/cpp/statistics/types/types.h | 54 +- src/cpp/statistics/types/typesCdrAux.hpp | 35 +- src/cpp/statistics/types/typesCdrAux.ipp | 136 +- src/cpp/statistics/types/typesPubSubTypes.cxx | 37 + src/cpp/statistics/types/typesPubSubTypes.h | 1792 +++++++++-------- src/cpp/statistics/types/typesv1.cxx | 464 ++--- src/cpp/statistics/types/typesv1.h | 69 +- test/blackbox/types/FixedSizedPubSubTypes.h | 2 +- test/blackbox/types/KeyedHelloWorldv1.cxx | 8 +- test/blackbox/types/UnboundedHelloWorldv1.h | 4 +- .../types/statistics/monitorservice_types.h | 12 +- .../monitorservice_typesPubSubTypes.h | 891 ++++---- .../statistics/monitorservice_typesv1.cxx | 1 - .../types/statistics/monitorservice_typesv1.h | 16 +- test/blackbox/types/statistics/types.cxx | 349 ++-- test/blackbox/types/statistics/types.h | 54 +- .../blackbox/types/statistics/typesCdrAux.hpp | 35 +- .../blackbox/types/statistics/typesCdrAux.ipp | 136 +- .../types/statistics/typesPubSubTypes.cxx | 37 + .../types/statistics/typesPubSubTypes.h | 1792 +++++++++-------- test/blackbox/types/statistics/typesv1.cxx | 464 ++--- test/blackbox/types/statistics/typesv1.h | 69 +- test/unittest/dynamic_types/idl/Testv1.cxx | 6 +- .../dynamic_types/idl/new_features_4_2.h | 1 + test/unittest/xtypes/idl/WideEnum.h | 2 + 48 files changed, 4039 insertions(+), 3714 deletions(-) diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h index 18c1255a55c..207a02e1cd0 100644 --- a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h +++ b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h index ffa004bf597..e035dba4d0e 100644 --- a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h +++ b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h @@ -26,6 +26,7 @@ #ifndef _FAST_DDS_GENERATED_ADVANCEDCONFIGURATION_H_ #define _FAST_DDS_GENERATED_ADVANCEDCONFIGURATION_H_ + #include #include #include @@ -34,6 +35,7 @@ #include #include +#include #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h index b7f2c30d856..aaf09e4bc57 100644 --- a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h +++ b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h index 8ee7933f273..5cd0ddba511 100644 --- a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h +++ b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h index b36859bc9ca..46b1c16c138 100644 --- a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h +++ b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.cxx b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.cxx index 0572e9af97e..64d77540aa4 100644 --- a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.cxx +++ b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.cxx @@ -215,10 +215,10 @@ void HelloMsg::serializeKey( eprosima::fastcdr::Cdr& scdr) const { (void) scdr; - + scdr << m_deadlinekey; - - + + } /*! diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.h b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.h index 8ee7933f273..5cd0ddba511 100644 --- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.h +++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/Filtering/FilteringExample.h b/examples/cpp/dds/Filtering/FilteringExample.h index 396040053ea..c57439eb75c 100644 --- a/examples/cpp/dds/Filtering/FilteringExample.h +++ b/examples/cpp/dds/Filtering/FilteringExample.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.h b/examples/cpp/dds/FlowControlExample/FlowControlExample.h index 7d6cb4eead7..d68406cb810 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExample.h +++ b/examples/cpp/dds/FlowControlExample/FlowControlExample.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorld.h b/examples/cpp/dds/HelloWorldExample/HelloWorld.h index 8ee7933f273..5cd0ddba511 100644 --- a/examples/cpp/dds/HelloWorldExample/HelloWorld.h +++ b/examples/cpp/dds/HelloWorldExample/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h index c5cccd6f5fe..8c7406a074a 100644 --- a/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h +++ b/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h @@ -35,6 +35,8 @@ #include #include +#include + #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) #define eProsima_user_DllExport __declspec( dllexport ) diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h index 4bb670fc014..1fa4522175d 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h index 25f811d2b67..2ce1eddefa3 100644 --- a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h +++ b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/RequestReplyExample/Calculator.h b/examples/cpp/dds/RequestReplyExample/Calculator.h index ef319599636..945af396175 100644 --- a/examples/cpp/dds/RequestReplyExample/Calculator.h +++ b/examples/cpp/dds/RequestReplyExample/Calculator.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h index 8ee7933f273..5cd0ddba511 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h +++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h index 8ee7933f273..5cd0ddba511 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h +++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h index 7028095a060..80d8feaca9b 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h index 7028095a060..80d8feaca9b 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h index f0487c66792..e1c1a3017e7 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h @@ -140,7 +140,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override { - if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) + if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) { return is_plain_xcdrv2_impl(); } diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h index ca95cdfdbf9..abb56e2c0bf 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h @@ -38,557 +38,560 @@ Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // GEN_API_VER -namespace eprosima { -namespace fastdds { -namespace statistics { +namespace eprosima +{ + namespace fastdds + { + namespace statistics + { -/*! - * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Connection type; + typedef Connection type; - eProsima_user_DllExport ConnectionPubSubType(); + eProsima_user_DllExport ConnectionPubSubType(); - eProsima_user_DllExport ~ConnectionPubSubType() override; + eProsima_user_DllExport ~ConnectionPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef QosPolicyCount_s type; + typedef QosPolicyCount_s type; - eProsima_user_DllExport QosPolicyCount_sPubSubType(); + eProsima_user_DllExport QosPolicyCount_sPubSubType(); - eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; + eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef BaseStatus_s type; + typedef BaseStatus_s type; - eProsima_user_DllExport BaseStatus_sPubSubType(); + eProsima_user_DllExport BaseStatus_sPubSubType(); - eProsima_user_DllExport ~BaseStatus_sPubSubType() override; + eProsima_user_DllExport ~BaseStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -typedef std::vector QosPolicyCountSeq_s; + typedef std::vector QosPolicyCountSeq_s; -/*! - * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef IncompatibleQoSStatus_s type; + typedef IncompatibleQoSStatus_s type; - eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType(); + eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType(); - eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; + eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef LivelinessChangedStatus_s type; + typedef LivelinessChangedStatus_s type; - eProsima_user_DllExport LivelinessChangedStatus_sPubSubType(); + eProsima_user_DllExport LivelinessChangedStatus_sPubSubType(); - eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; + eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef DeadlineMissedStatus_s type; + typedef DeadlineMissedStatus_s type; - eProsima_user_DllExport DeadlineMissedStatus_sPubSubType(); + eProsima_user_DllExport DeadlineMissedStatus_sPubSubType(); - eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; + eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; -typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s; -typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; + }; + typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; + typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s; + typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; @@ -597,96 +600,96 @@ typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; -/*! - * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef MonitorServiceStatusData type; + typedef MonitorServiceStatusData type; - eProsima_user_DllExport MonitorServiceStatusDataPubSubType(); + eProsima_user_DllExport MonitorServiceStatusDataPubSubType(); - eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; + eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -} // namespace statistics -} // namespace fastdds -} // namespace eprosima + }; + } + } +} #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_ diff --git a/src/cpp/statistics/types/monitorservice_typesv1.cxx b/src/cpp/statistics/types/monitorservice_typesv1.cxx index 89494b4018c..6325d475d5e 100644 --- a/src/cpp/statistics/types/monitorservice_typesv1.cxx +++ b/src/cpp/statistics/types/monitorservice_typesv1.cxx @@ -84,7 +84,6 @@ struct FindType { } #define eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize 852ULL; - #define eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize 8ULL; diff --git a/src/cpp/statistics/types/monitorservice_typesv1.h b/src/cpp/statistics/types/monitorservice_typesv1.h index 8dcaa428b62..61cc2c52262 100644 --- a/src/cpp/statistics/types/monitorservice_typesv1.h +++ b/src/cpp/statistics/types/monitorservice_typesv1.h @@ -212,8 +212,7 @@ namespace eprosima { * @brief This function returns a constant reference to member announced_locators * @return Constant reference to member announced_locators */ - eProsima_user_DllExport const std::vector& announced_locators() - const; + eProsima_user_DllExport const std::vector& announced_locators() const; /*! * @brief This function returns a reference to member announced_locators @@ -1336,8 +1335,7 @@ namespace eprosima { * @return Constant reference to member incompatible_qos_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() const; /*! * @brief This function returns a reference to member incompatible_qos_status @@ -1366,8 +1364,7 @@ namespace eprosima { * @return Constant reference to member inconsistent_topic_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() const; /*! * @brief This function returns a reference to member inconsistent_topic_status @@ -1425,8 +1422,7 @@ namespace eprosima { * @return Constant reference to member liveliness_changed_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() const; /*! * @brief This function returns a reference to member liveliness_changed_status @@ -1543,6 +1539,9 @@ namespace eprosima { eprosima::fastcdr::Cdr& cdr); + + + private: eprosima::fastdds::statistics::StatusKind m__d; @@ -1753,8 +1752,8 @@ namespace eprosima { }; -} // namespace statistics -} // namespace fastdds + } // namespace statistics + } // namespace fastdds } // namespace eprosima #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_H_ diff --git a/src/cpp/statistics/types/types.cxx b/src/cpp/statistics/types/types.cxx index 9dcb86ef67b..4d5a55c6edd 100644 --- a/src/cpp/statistics/types/types.cxx +++ b/src/cpp/statistics/types/types.cxx @@ -2222,12 +2222,15 @@ std::string& PhysicalData::process() } +namespace EventKind { +} // namespace EventKind + Data::Data() { - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } Data::~Data() @@ -2241,51 +2244,51 @@ Data::Data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -2301,58 +2304,58 @@ Data::Data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -2369,51 +2372,51 @@ Data& Data::operator =( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -2431,58 +2434,58 @@ Data& Data::operator =( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -2504,51 +2507,51 @@ bool Data::operator ==( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: return (m_writer_reader_data == x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: return (m_locator2locator_data == x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: return (m_entity_data == x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: return (m_entity2locator_traffic == x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: return (m_entity_count == x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: return (m_discovery_time == x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: return (m_sample_identity_count == x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: return (m_physical_data == x.m_physical_data); break; @@ -2565,16 +2568,16 @@ bool Data::operator !=( } void Data::_d( - eprosima::fastdds::statistics::EventKind __d) + uint32_t __d) { bool b = false; switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: switch (__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2583,10 +2586,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: switch (__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2595,12 +2598,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: switch (__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2609,12 +2612,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: switch (__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2623,24 +2626,24 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: switch (__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -2649,10 +2652,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: switch (__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -2661,10 +2664,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: switch (__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -2673,10 +2676,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: switch (__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -2696,12 +2699,12 @@ void Data::_d( m__d = __d; } -eprosima::fastdds::statistics::EventKind Data::_d() const +uint32_t Data::_d() const { return m__d; } -eprosima::fastdds::statistics::EventKind& Data::_d() +uint32_t& Data::_d() { return m__d; } @@ -2710,7 +2713,7 @@ void Data::writer_reader_data( const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data) { m_writer_reader_data = _writer_reader_data; - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -2718,7 +2721,7 @@ void Data::writer_reader_data( eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data) { m_writer_reader_data = std::move(_writer_reader_data); - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -2728,7 +2731,7 @@ const eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2749,7 +2752,7 @@ eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data() switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2769,7 +2772,7 @@ void Data::locator2locator_data( const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data) { m_locator2locator_data = _locator2locator_data; - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -2777,7 +2780,7 @@ void Data::locator2locator_data( eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data) { m_locator2locator_data = std::move(_locator2locator_data); - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -2787,7 +2790,7 @@ const eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_ switch (m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2808,7 +2811,7 @@ eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_data() switch (m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2828,7 +2831,7 @@ void Data::entity_data( const eprosima::fastdds::statistics::EntityData& _entity_data) { m_entity_data = _entity_data; - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -2836,7 +2839,7 @@ void Data::entity_data( eprosima::fastdds::statistics::EntityData&& _entity_data) { m_entity_data = std::move(_entity_data); - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -2846,8 +2849,8 @@ const eprosima::fastdds::statistics::EntityData& Data::entity_data() const switch (m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2868,8 +2871,8 @@ eprosima::fastdds::statistics::EntityData& Data::entity_data() switch (m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2889,7 +2892,7 @@ void Data::entity2locator_traffic( const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic) { m_entity2locator_traffic = _entity2locator_traffic; - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -2897,7 +2900,7 @@ void Data::entity2locator_traffic( eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic) { m_entity2locator_traffic = std::move(_entity2locator_traffic); - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -2907,8 +2910,8 @@ const eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator switch (m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2929,8 +2932,8 @@ eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator_traff switch (m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2950,7 +2953,7 @@ void Data::entity_count( const eprosima::fastdds::statistics::EntityCount& _entity_count) { m_entity_count = _entity_count; - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -2958,7 +2961,7 @@ void Data::entity_count( eprosima::fastdds::statistics::EntityCount&& _entity_count) { m_entity_count = std::move(_entity_count); - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -2968,14 +2971,14 @@ const eprosima::fastdds::statistics::EntityCount& Data::entity_count() const switch (m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -2996,14 +2999,14 @@ eprosima::fastdds::statistics::EntityCount& Data::entity_count() switch (m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -3023,7 +3026,7 @@ void Data::discovery_time( const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time) { m_discovery_time = _discovery_time; - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -3031,7 +3034,7 @@ void Data::discovery_time( eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time) { m_discovery_time = std::move(_discovery_time); - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -3041,7 +3044,7 @@ const eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() const switch (m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3062,7 +3065,7 @@ eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() switch (m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3082,7 +3085,7 @@ void Data::sample_identity_count( const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count) { m_sample_identity_count = _sample_identity_count; - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -3090,7 +3093,7 @@ void Data::sample_identity_count( eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count) { m_sample_identity_count = std::move(_sample_identity_count); - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -3100,7 +3103,7 @@ const eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_ switch (m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3121,7 +3124,7 @@ eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_count( switch (m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3141,7 +3144,7 @@ void Data::physical_data( const eprosima::fastdds::statistics::PhysicalData& _physical_data) { m_physical_data = _physical_data; - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -3149,7 +3152,7 @@ void Data::physical_data( eprosima::fastdds::statistics::PhysicalData&& _physical_data) { m_physical_data = std::move(_physical_data); - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -3159,7 +3162,7 @@ const eprosima::fastdds::statistics::PhysicalData& Data::physical_data() const switch (m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -3180,7 +3183,7 @@ eprosima::fastdds::statistics::PhysicalData& Data::physical_data() switch (m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: diff --git a/src/cpp/statistics/types/types.h b/src/cpp/statistics/types/types.h index c51a79f2044..b67fc919497 100644 --- a/src/cpp/statistics/types/types.h +++ b/src/cpp/statistics/types/types.h @@ -1966,31 +1966,27 @@ class PhysicalData std::string m_process; }; -/*! - * @brief This enumeration represents the EventKind bitflags defined by the user in the IDL file. - * @ingroup types - */ -enum EventKindBits : uint32_t -{ - HISTORY2HISTORY_LATENCY = 0x01ull << 0, - NETWORK_LATENCY = 0x01ull << 1, - PUBLICATION_THROUGHPUT = 0x01ull << 2, - SUBSCRIPTION_THROUGHPUT = 0x01ull << 3, - RTPS_SENT = 0x01ull << 4, - RTPS_LOST = 0x01ull << 5, - RESENT_DATAS = 0x01ull << 6, - HEARTBEAT_COUNT = 0x01ull << 7, - ACKNACK_COUNT = 0x01ull << 8, - NACKFRAG_COUNT = 0x01ull << 9, - GAP_COUNT = 0x01ull << 10, - DATA_COUNT = 0x01ull << 11, - PDP_PACKETS = 0x01ull << 12, - EDP_PACKETS = 0x01ull << 13, - DISCOVERED_ENTITY = 0x01ull << 14, - SAMPLE_DATAS = 0x01ull << 15, - PHYSICAL_DATA = 0x01ull << 16 -}; -typedef uint32_t EventKind; +namespace EventKind { + +const uint32_t HISTORY2HISTORY_LATENCY = 1; +const uint32_t NETWORK_LATENCY = 2; +const uint32_t PUBLICATION_THROUGHPUT = 4; +const uint32_t SUBSCRIPTION_THROUGHPUT = 8; +const uint32_t RTPS_SENT = 16; +const uint32_t RTPS_LOST = 32; +const uint32_t RESENT_DATAS = 64; +const uint32_t HEARTBEAT_COUNT = 128; +const uint32_t ACKNACK_COUNT = 256; +const uint32_t NACKFRAG_COUNT = 512; +const uint32_t GAP_COUNT = 1024; +const uint32_t DATA_COUNT = 2048; +const uint32_t PDP_PACKETS = 4096; +const uint32_t EDP_PACKETS = 8192; +const uint32_t DISCOVERED_ENTITY = 16384; +const uint32_t SAMPLE_DATAS = 32768; +const uint32_t PHYSICAL_DATA = 65536; + +} // namespace EventKind /*! @@ -2059,19 +2055,19 @@ class Data * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ eProsima_user_DllExport void _d( - eprosima::fastdds::statistics::EventKind __d); + uint32_t __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const; + eProsima_user_DllExport uint32_t _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d(); + eProsima_user_DllExport uint32_t& _d(); /*! * @brief This function copies the value in member writer_reader_data @@ -2306,7 +2302,7 @@ class Data private: - eprosima::fastdds::statistics::EventKind m__d; + uint32_t m__d; eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data; eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data; diff --git a/src/cpp/statistics/types/typesCdrAux.hpp b/src/cpp/statistics/types/typesCdrAux.hpp index 92b36ffa689..84dea0ade66 100644 --- a/src/cpp/statistics/types/typesCdrAux.hpp +++ b/src/cpp/statistics/types/typesCdrAux.hpp @@ -30,7 +30,6 @@ constexpr uint32_t eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesiz constexpr uint32_t eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize {812UL}; constexpr uint32_t eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize {28UL}; - constexpr uint32_t eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize {28UL}; constexpr uint32_t eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize {0UL}; @@ -169,6 +168,40 @@ eProsima_user_DllExport void serialize_key( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } // namespace fastcdr } // namespace eprosima diff --git a/src/cpp/statistics/types/typesCdrAux.ipp b/src/cpp/statistics/types/typesCdrAux.ipp index 28b168d672d..4c0055ba1fb 100644 --- a/src/cpp/statistics/types/typesCdrAux.ipp +++ b/src/cpp/statistics/types/typesCdrAux.ipp @@ -1473,6 +1473,40 @@ void serialize_key( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + template<> eProsima_user_DllExport size_t calculate_serialized_size( eprosima::fastcdr::CdrSizeCalculator& calculator, @@ -1495,51 +1529,51 @@ eProsima_user_DllExport size_t calculate_serialized_size( switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(1), data.writer_reader_data(), current_alignment); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(2), data.locator2locator_data(), current_alignment); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(3), data.entity_data(), current_alignment); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(4), data.entity2locator_traffic(), current_alignment); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(5), data.entity_count(), current_alignment); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(6), data.discovery_time(), current_alignment); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(7), data.sample_identity_count(), current_alignment); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(8), data.physical_data(), current_alignment); break; @@ -1571,44 +1605,44 @@ eProsima_user_DllExport void serialize( switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: scdr << eprosima::fastcdr::MemberId(1) << data.writer_reader_data(); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: scdr << eprosima::fastcdr::MemberId(2) << data.locator2locator_data(); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: scdr << eprosima::fastcdr::MemberId(3) << data.entity_data(); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: scdr << eprosima::fastcdr::MemberId(4) << data.entity2locator_traffic(); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: scdr << eprosima::fastcdr::MemberId(5) << data.entity_count(); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: scdr << eprosima::fastcdr::MemberId(6) << data.discovery_time(); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: scdr << eprosima::fastcdr::MemberId(7) << data.sample_identity_count(); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: scdr << eprosima::fastcdr::MemberId(8) << data.physical_data(); break; @@ -1640,44 +1674,44 @@ eProsima_user_DllExport void deserialize( default: switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: dcdr >> data.writer_reader_data(); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: dcdr >> data.locator2locator_data(); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: dcdr >> data.entity_data(); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: dcdr >> data.entity2locator_traffic(); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: dcdr >> data.entity_count(); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: dcdr >> data.discovery_time(); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: dcdr >> data.sample_identity_count(); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: dcdr >> data.physical_data(); break; diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index 5d92b732491..32d3d775779 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -2696,6 +2696,43 @@ namespace eprosima { return true; } + namespace EventKind { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } //End of namespace EventKind diff --git a/src/cpp/statistics/types/typesPubSubTypes.h b/src/cpp/statistics/types/typesPubSubTypes.h index 4cee82044c4..4f1c0b0b272 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.h +++ b/src/cpp/statistics/types/typesPubSubTypes.h @@ -37,1279 +37,1319 @@ Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // GEN_API_VER -namespace eprosima { -namespace fastdds { -namespace statistics { -namespace detail { +namespace eprosima +{ + namespace fastdds + { + namespace statistics + { + namespace detail + { -/*! - * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file. - * @ingroup types - */ -class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file. + * @ingroup types + */ + class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityId_s type; + typedef EntityId_s type; - eProsima_user_DllExport EntityId_sPubSubType(); + eProsima_user_DllExport EntityId_sPubSubType(); - eProsima_user_DllExport ~EntityId_sPubSubType() override; + eProsima_user_DllExport ~EntityId_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file. - * @ingroup types - */ -class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file. + * @ingroup types + */ + class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef GuidPrefix_s type; + typedef GuidPrefix_s type; - eProsima_user_DllExport GuidPrefix_sPubSubType(); + eProsima_user_DllExport GuidPrefix_sPubSubType(); - eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; + eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file. - * @ingroup types - */ -class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file. + * @ingroup types + */ + class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef GUID_s type; + typedef GUID_s type; - eProsima_user_DllExport GUID_sPubSubType(); + eProsima_user_DllExport GUID_sPubSubType(); - eProsima_user_DllExport ~GUID_sPubSubType() override; + eProsima_user_DllExport ~GUID_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file. - * @ingroup types - */ -class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file. + * @ingroup types + */ + class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SequenceNumber_s type; + typedef SequenceNumber_s type; - eProsima_user_DllExport SequenceNumber_sPubSubType(); + eProsima_user_DllExport SequenceNumber_sPubSubType(); - eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; + eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file. - * @ingroup types - */ -class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file. + * @ingroup types + */ + class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SampleIdentity_s type; + typedef SampleIdentity_s type; - eProsima_user_DllExport SampleIdentity_sPubSubType(); + eProsima_user_DllExport SampleIdentity_sPubSubType(); - eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; + eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file. - * @ingroup types - */ -class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file. + * @ingroup types + */ + class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Locator_s type; + typedef Locator_s type; - eProsima_user_DllExport Locator_sPubSubType(); + eProsima_user_DllExport Locator_sPubSubType(); - eProsima_user_DllExport ~Locator_sPubSubType() override; + eProsima_user_DllExport ~Locator_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -} // namespace detail + }; + } -/*! - * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file. - * @ingroup types - */ -class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file. + * @ingroup types + */ + class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef DiscoveryTime type; + typedef DiscoveryTime type; - eProsima_user_DllExport DiscoveryTimePubSubType(); + eProsima_user_DllExport DiscoveryTimePubSubType(); - eProsima_user_DllExport ~DiscoveryTimePubSubType() override; + eProsima_user_DllExport ~DiscoveryTimePubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file. - * @ingroup types - */ -class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file. + * @ingroup types + */ + class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityCount type; + typedef EntityCount type; - eProsima_user_DllExport EntityCountPubSubType(); + eProsima_user_DllExport EntityCountPubSubType(); - eProsima_user_DllExport ~EntityCountPubSubType() override; + eProsima_user_DllExport ~EntityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file. - * @ingroup types - */ -class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file. + * @ingroup types + */ + class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SampleIdentityCount type; + typedef SampleIdentityCount type; - eProsima_user_DllExport SampleIdentityCountPubSubType(); + eProsima_user_DllExport SampleIdentityCountPubSubType(); - eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; + eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file. - * @ingroup types - */ -class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file. + * @ingroup types + */ + class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Entity2LocatorTraffic type; + typedef Entity2LocatorTraffic type; - eProsima_user_DllExport Entity2LocatorTrafficPubSubType(); + eProsima_user_DllExport Entity2LocatorTrafficPubSubType(); - eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; + eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file. - * @ingroup types - */ -class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file. + * @ingroup types + */ + class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef WriterReaderData type; + typedef WriterReaderData type; - eProsima_user_DllExport WriterReaderDataPubSubType(); + eProsima_user_DllExport WriterReaderDataPubSubType(); - eProsima_user_DllExport ~WriterReaderDataPubSubType() override; + eProsima_user_DllExport ~WriterReaderDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file. - * @ingroup types - */ -class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file. + * @ingroup types + */ + class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Locator2LocatorData type; + typedef Locator2LocatorData type; - eProsima_user_DllExport Locator2LocatorDataPubSubType(); + eProsima_user_DllExport Locator2LocatorDataPubSubType(); - eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; + eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file. - * @ingroup types - */ -class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file. + * @ingroup types + */ + class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityData type; + typedef EntityData type; - eProsima_user_DllExport EntityDataPubSubType(); + eProsima_user_DllExport EntityDataPubSubType(); - eProsima_user_DllExport ~EntityDataPubSubType() override; + eProsima_user_DllExport ~EntityDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file. - * @ingroup types - */ -class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file. + * @ingroup types + */ + class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef PhysicalData type; + typedef PhysicalData type; - eProsima_user_DllExport PhysicalDataPubSubType(); + eProsima_user_DllExport PhysicalDataPubSubType(); - eProsima_user_DllExport ~PhysicalDataPubSubType() override; + eProsima_user_DllExport ~PhysicalDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; + + }; + namespace EventKind + { + -}; -} // namespace statistics -} // namespace fastdds -} // namespace eprosima + + + + + + + + + + + + + + + + + + + + + + + + + + + + } + + + + + } + } +} #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_ diff --git a/src/cpp/statistics/types/typesv1.cxx b/src/cpp/statistics/types/typesv1.cxx index 80c55edc2e6..ed4305447f1 100644 --- a/src/cpp/statistics/types/typesv1.cxx +++ b/src/cpp/statistics/types/typesv1.cxx @@ -85,7 +85,6 @@ struct FindType { #define eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize 852ULL; #define eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize 812ULL; - #define eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize 28ULL; #define eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize 16ULL; @@ -3529,12 +3528,15 @@ std::string& PhysicalData::process() +namespace EventKind { + +} // namespace EventKind Data::Data() { - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; // eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data // eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data @@ -3564,51 +3566,51 @@ Data::Data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -3624,58 +3626,58 @@ Data::Data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -3692,51 +3694,51 @@ Data& Data::operator =( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -3754,58 +3756,58 @@ Data& Data::operator =( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -3827,51 +3829,51 @@ bool Data::operator ==( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: return (m_writer_reader_data == x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: return (m_locator2locator_data == x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: return (m_entity_data == x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: return (m_entity2locator_traffic == x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: return (m_entity_count == x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: return (m_discovery_time == x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: return (m_sample_identity_count == x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: return (m_physical_data == x.m_physical_data); break; @@ -3888,16 +3890,16 @@ bool Data::operator !=( } void Data::_d( - eprosima::fastdds::statistics::EventKind __d) + uint32_t __d) { bool b = false; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: switch(__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -3906,10 +3908,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: switch(__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -3918,12 +3920,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: switch(__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -3932,12 +3934,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: switch(__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -3946,24 +3948,24 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: switch(__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -3972,10 +3974,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: switch(__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3984,10 +3986,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: switch(__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3996,10 +3998,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: switch(__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4017,12 +4019,12 @@ void Data::_d( m__d = __d; } -eprosima::fastdds::statistics::EventKind Data::_d() const +uint32_t Data::_d() const { return m__d; } -eprosima::fastdds::statistics::EventKind& Data::_d() +uint32_t& Data::_d() { return m__d; } @@ -4031,7 +4033,7 @@ void Data::writer_reader_data( const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data) { m_writer_reader_data = _writer_reader_data; - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -4039,7 +4041,7 @@ void Data::writer_reader_data( eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data) { m_writer_reader_data = std::move(_writer_reader_data); - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -4049,7 +4051,7 @@ const eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -4070,7 +4072,7 @@ eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data() switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -4090,7 +4092,7 @@ void Data::locator2locator_data( const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data) { m_locator2locator_data = _locator2locator_data; - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -4098,7 +4100,7 @@ void Data::locator2locator_data( eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data) { m_locator2locator_data = std::move(_locator2locator_data); - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -4108,7 +4110,7 @@ const eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_ switch(m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -4129,7 +4131,7 @@ eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_data() switch(m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -4149,7 +4151,7 @@ void Data::entity_data( const eprosima::fastdds::statistics::EntityData& _entity_data) { m_entity_data = _entity_data; - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -4157,7 +4159,7 @@ void Data::entity_data( eprosima::fastdds::statistics::EntityData&& _entity_data) { m_entity_data = std::move(_entity_data); - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -4167,8 +4169,8 @@ const eprosima::fastdds::statistics::EntityData& Data::entity_data() const switch(m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -4189,8 +4191,8 @@ eprosima::fastdds::statistics::EntityData& Data::entity_data() switch(m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -4210,7 +4212,7 @@ void Data::entity2locator_traffic( const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic) { m_entity2locator_traffic = _entity2locator_traffic; - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -4218,7 +4220,7 @@ void Data::entity2locator_traffic( eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic) { m_entity2locator_traffic = std::move(_entity2locator_traffic); - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -4228,8 +4230,8 @@ const eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator switch(m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -4250,8 +4252,8 @@ eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator_traff switch(m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -4271,7 +4273,7 @@ void Data::entity_count( const eprosima::fastdds::statistics::EntityCount& _entity_count) { m_entity_count = _entity_count; - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -4279,7 +4281,7 @@ void Data::entity_count( eprosima::fastdds::statistics::EntityCount&& _entity_count) { m_entity_count = std::move(_entity_count); - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -4289,14 +4291,14 @@ const eprosima::fastdds::statistics::EntityCount& Data::entity_count() const switch(m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -4317,14 +4319,14 @@ eprosima::fastdds::statistics::EntityCount& Data::entity_count() switch(m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -4344,7 +4346,7 @@ void Data::discovery_time( const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time) { m_discovery_time = _discovery_time; - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -4352,7 +4354,7 @@ void Data::discovery_time( eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time) { m_discovery_time = std::move(_discovery_time); - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -4362,7 +4364,7 @@ const eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() const switch(m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -4383,7 +4385,7 @@ eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() switch(m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -4403,7 +4405,7 @@ void Data::sample_identity_count( const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count) { m_sample_identity_count = _sample_identity_count; - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -4411,7 +4413,7 @@ void Data::sample_identity_count( eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count) { m_sample_identity_count = std::move(_sample_identity_count); - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -4421,7 +4423,7 @@ const eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_ switch(m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -4442,7 +4444,7 @@ eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_count( switch(m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -4462,7 +4464,7 @@ void Data::physical_data( const eprosima::fastdds::statistics::PhysicalData& _physical_data) { m_physical_data = _physical_data; - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -4470,7 +4472,7 @@ void Data::physical_data( eprosima::fastdds::statistics::PhysicalData&& _physical_data) { m_physical_data = std::move(_physical_data); - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -4480,7 +4482,7 @@ const eprosima::fastdds::statistics::PhysicalData& Data::physical_data() const switch(m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4501,7 +4503,7 @@ eprosima::fastdds::statistics::PhysicalData& Data::physical_data() switch(m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4525,61 +4527,64 @@ size_t Data::getCdrSerializedSize( (void)data; size_t initial_alignment = current_alignment; + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + + switch(data.m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: current_alignment += eprosima::fastdds::statistics::WriterReaderData::getCdrSerializedSize(data.writer_reader_data(), current_alignment); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: current_alignment += eprosima::fastdds::statistics::Locator2LocatorData::getCdrSerializedSize(data.locator2locator_data(), current_alignment); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: current_alignment += eprosima::fastdds::statistics::EntityData::getCdrSerializedSize(data.entity_data(), current_alignment); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: current_alignment += eprosima::fastdds::statistics::Entity2LocatorTraffic::getCdrSerializedSize(data.entity2locator_traffic(), current_alignment); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: current_alignment += eprosima::fastdds::statistics::EntityCount::getCdrSerializedSize(data.entity_count(), current_alignment); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: current_alignment += eprosima::fastdds::statistics::DiscoveryTime::getCdrSerializedSize(data.discovery_time(), current_alignment); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: current_alignment += eprosima::fastdds::statistics::SampleIdentityCount::getCdrSerializedSize(data.sample_identity_count(), current_alignment); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: current_alignment += eprosima::fastdds::statistics::PhysicalData::getCdrSerializedSize(data.physical_data(), current_alignment); break; @@ -4595,62 +4600,62 @@ size_t Data::getCdrSerializedSize( void Data::serialize( eprosima::fastcdr::Cdr& scdr) const { - scdr << (uint32_t)m__d; + scdr << m__d; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: scdr << m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: scdr << m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: scdr << m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: scdr << m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: scdr << m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: scdr << m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: scdr << m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: scdr << m_physical_data; break; @@ -4663,75 +4668,70 @@ void Data::serialize( void Data::deserialize( eprosima::fastcdr::Cdr& dcdr) { - { - uint32_t bitmask_value = 0; - dcdr >> bitmask_value; - m__d = (eprosima::fastdds::statistics::EventKind)bitmask_value; - } - + dcdr >> m__d; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: dcdr >> m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: dcdr >> m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: dcdr >> m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: dcdr >> m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: dcdr >> m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: dcdr >> m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: dcdr >> m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: dcdr >> m_physical_data; diff --git a/src/cpp/statistics/types/typesv1.h b/src/cpp/statistics/types/typesv1.h index ab918b661cc..5bf56607a1c 100644 --- a/src/cpp/statistics/types/typesv1.h +++ b/src/cpp/statistics/types/typesv1.h @@ -2699,31 +2699,42 @@ namespace eprosima { }; - /*! - * @brief This class represents the bitmask EventKind defined by the user in the IDL file. - * @ingroup types - */ - enum EventKindBits : uint32_t - { - HISTORY2HISTORY_LATENCY = 0x01ull << 0, - NETWORK_LATENCY = 0x01ull << 1, - PUBLICATION_THROUGHPUT = 0x01ull << 2, - SUBSCRIPTION_THROUGHPUT = 0x01ull << 3, - RTPS_SENT = 0x01ull << 4, - RTPS_LOST = 0x01ull << 5, - RESENT_DATAS = 0x01ull << 6, - HEARTBEAT_COUNT = 0x01ull << 7, - ACKNACK_COUNT = 0x01ull << 8, - NACKFRAG_COUNT = 0x01ull << 9, - GAP_COUNT = 0x01ull << 10, - DATA_COUNT = 0x01ull << 11, - PDP_PACKETS = 0x01ull << 12, - EDP_PACKETS = 0x01ull << 13, - DISCOVERED_ENTITY = 0x01ull << 14, - SAMPLE_DATAS = 0x01ull << 15, - PHYSICAL_DATA = 0x01ull << 16 - }; - typedef uint32_t EventKind; + namespace EventKind { + const uint32_t HISTORY2HISTORY_LATENCY = 1; + + const uint32_t NETWORK_LATENCY = 2; + + const uint32_t PUBLICATION_THROUGHPUT = 4; + + const uint32_t SUBSCRIPTION_THROUGHPUT = 8; + + const uint32_t RTPS_SENT = 16; + + const uint32_t RTPS_LOST = 32; + + const uint32_t RESENT_DATAS = 64; + + const uint32_t HEARTBEAT_COUNT = 128; + + const uint32_t ACKNACK_COUNT = 256; + + const uint32_t NACKFRAG_COUNT = 512; + + const uint32_t GAP_COUNT = 1024; + + const uint32_t DATA_COUNT = 2048; + + const uint32_t PDP_PACKETS = 4096; + + const uint32_t EDP_PACKETS = 8192; + + const uint32_t DISCOVERED_ENTITY = 16384; + + const uint32_t SAMPLE_DATAS = 32768; + + const uint32_t PHYSICAL_DATA = 65536; + + } // namespace EventKind /*! @@ -2792,19 +2803,19 @@ namespace eprosima { * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ eProsima_user_DllExport void _d( - eprosima::fastdds::statistics::EventKind __d); + uint32_t __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const; + eProsima_user_DllExport uint32_t _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d(); + eProsima_user_DllExport uint32_t& _d(); /*! * @brief This function copies the value in member writer_reader_data @@ -3070,7 +3081,7 @@ namespace eprosima { private: - eprosima::fastdds::statistics::EventKind m__d; + uint32_t m__d; eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data; eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.h b/test/blackbox/types/FixedSizedPubSubTypes.h index 6031f646f73..16f58586d46 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.h +++ b/test/blackbox/types/FixedSizedPubSubTypes.h @@ -140,7 +140,7 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override { - if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) + if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) { return is_plain_xcdrv2_impl(); } diff --git a/test/blackbox/types/KeyedHelloWorldv1.cxx b/test/blackbox/types/KeyedHelloWorldv1.cxx index 78ba486bfc5..bc8f66b7f79 100644 --- a/test/blackbox/types/KeyedHelloWorldv1.cxx +++ b/test/blackbox/types/KeyedHelloWorldv1.cxx @@ -239,11 +239,11 @@ void KeyedHelloWorld::serializeKey( eprosima::fastcdr::Cdr& scdr) const { (void) scdr; - + scdr << m_key; - - - + + + } /*! diff --git a/test/blackbox/types/UnboundedHelloWorldv1.h b/test/blackbox/types/UnboundedHelloWorldv1.h index c9841d4b711..abb0d09e23e 100644 --- a/test/blackbox/types/UnboundedHelloWorldv1.h +++ b/test/blackbox/types/UnboundedHelloWorldv1.h @@ -27,8 +27,6 @@ #define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_H_ -#include - #include #include #include @@ -37,6 +35,8 @@ #include #include +#include + #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) #define eProsima_user_DllExport __declspec( dllexport ) diff --git a/test/blackbox/types/statistics/monitorservice_types.h b/test/blackbox/types/statistics/monitorservice_types.h index 646e24b28d8..08f713a0ee3 100644 --- a/test/blackbox/types/statistics/monitorservice_types.h +++ b/test/blackbox/types/statistics/monitorservice_types.h @@ -219,8 +219,7 @@ class Connection * @brief This function returns a constant reference to member announced_locators * @return Constant reference to member announced_locators */ - eProsima_user_DllExport const std::vector& announced_locators() - const; + eProsima_user_DllExport const std::vector& announced_locators() const; /*! * @brief This function returns a reference to member announced_locators @@ -1025,8 +1024,7 @@ class MonitorServiceData * @return Constant reference to member incompatible_qos_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() const; /*! * @brief This function returns a reference to member incompatible_qos_status @@ -1055,8 +1053,7 @@ class MonitorServiceData * @return Constant reference to member inconsistent_topic_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() const; /*! * @brief This function returns a reference to member inconsistent_topic_status @@ -1114,8 +1111,7 @@ class MonitorServiceData * @return Constant reference to member liveliness_changed_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() const; /*! * @brief This function returns a reference to member liveliness_changed_status diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h index ca95cdfdbf9..abb56e2c0bf 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h @@ -38,557 +38,560 @@ Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // GEN_API_VER -namespace eprosima { -namespace fastdds { -namespace statistics { +namespace eprosima +{ + namespace fastdds + { + namespace statistics + { -/*! - * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Connection type; + typedef Connection type; - eProsima_user_DllExport ConnectionPubSubType(); + eProsima_user_DllExport ConnectionPubSubType(); - eProsima_user_DllExport ~ConnectionPubSubType() override; + eProsima_user_DllExport ~ConnectionPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef QosPolicyCount_s type; + typedef QosPolicyCount_s type; - eProsima_user_DllExport QosPolicyCount_sPubSubType(); + eProsima_user_DllExport QosPolicyCount_sPubSubType(); - eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; + eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef BaseStatus_s type; + typedef BaseStatus_s type; - eProsima_user_DllExport BaseStatus_sPubSubType(); + eProsima_user_DllExport BaseStatus_sPubSubType(); - eProsima_user_DllExport ~BaseStatus_sPubSubType() override; + eProsima_user_DllExport ~BaseStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -typedef std::vector QosPolicyCountSeq_s; + typedef std::vector QosPolicyCountSeq_s; -/*! - * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef IncompatibleQoSStatus_s type; + typedef IncompatibleQoSStatus_s type; - eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType(); + eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType(); - eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; + eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef LivelinessChangedStatus_s type; + typedef LivelinessChangedStatus_s type; - eProsima_user_DllExport LivelinessChangedStatus_sPubSubType(); + eProsima_user_DllExport LivelinessChangedStatus_sPubSubType(); - eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; + eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef DeadlineMissedStatus_s type; + typedef DeadlineMissedStatus_s type; - eProsima_user_DllExport DeadlineMissedStatus_sPubSubType(); + eProsima_user_DllExport DeadlineMissedStatus_sPubSubType(); - eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; + eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; -typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s; -typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; + }; + typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; + typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s; + typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; @@ -597,96 +600,96 @@ typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s; -/*! - * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file. - * @ingroup monitorservice_types - */ -class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file. + * @ingroup monitorservice_types + */ + class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef MonitorServiceStatusData type; + typedef MonitorServiceStatusData type; - eProsima_user_DllExport MonitorServiceStatusDataPubSubType(); + eProsima_user_DllExport MonitorServiceStatusDataPubSubType(); - eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; + eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -} // namespace statistics -} // namespace fastdds -} // namespace eprosima + }; + } + } +} #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_ diff --git a/test/blackbox/types/statistics/monitorservice_typesv1.cxx b/test/blackbox/types/statistics/monitorservice_typesv1.cxx index 89494b4018c..6325d475d5e 100644 --- a/test/blackbox/types/statistics/monitorservice_typesv1.cxx +++ b/test/blackbox/types/statistics/monitorservice_typesv1.cxx @@ -84,7 +84,6 @@ struct FindType { } #define eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize 852ULL; - #define eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize 8ULL; diff --git a/test/blackbox/types/statistics/monitorservice_typesv1.h b/test/blackbox/types/statistics/monitorservice_typesv1.h index 9bdb776f6de..61cc2c52262 100644 --- a/test/blackbox/types/statistics/monitorservice_typesv1.h +++ b/test/blackbox/types/statistics/monitorservice_typesv1.h @@ -212,8 +212,7 @@ namespace eprosima { * @brief This function returns a constant reference to member announced_locators * @return Constant reference to member announced_locators */ - eProsima_user_DllExport const std::vector& announced_locators() - const; + eProsima_user_DllExport const std::vector& announced_locators() const; /*! * @brief This function returns a reference to member announced_locators @@ -1336,8 +1335,7 @@ namespace eprosima { * @return Constant reference to member incompatible_qos_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() const; /*! * @brief This function returns a reference to member incompatible_qos_status @@ -1366,8 +1364,7 @@ namespace eprosima { * @return Constant reference to member inconsistent_topic_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() const; /*! * @brief This function returns a reference to member inconsistent_topic_status @@ -1425,8 +1422,7 @@ namespace eprosima { * @return Constant reference to member liveliness_changed_status * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() - const; + eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() const; /*! * @brief This function returns a reference to member liveliness_changed_status @@ -1756,8 +1752,8 @@ namespace eprosima { }; -} // namespace statistics -} // namespace fastdds + } // namespace statistics + } // namespace fastdds } // namespace eprosima #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_H_ diff --git a/test/blackbox/types/statistics/types.cxx b/test/blackbox/types/statistics/types.cxx index 9dcb86ef67b..4d5a55c6edd 100644 --- a/test/blackbox/types/statistics/types.cxx +++ b/test/blackbox/types/statistics/types.cxx @@ -2222,12 +2222,15 @@ std::string& PhysicalData::process() } +namespace EventKind { +} // namespace EventKind + Data::Data() { - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } Data::~Data() @@ -2241,51 +2244,51 @@ Data::Data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -2301,58 +2304,58 @@ Data::Data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -2369,51 +2372,51 @@ Data& Data::operator =( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -2431,58 +2434,58 @@ Data& Data::operator =( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -2504,51 +2507,51 @@ bool Data::operator ==( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: return (m_writer_reader_data == x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: return (m_locator2locator_data == x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: return (m_entity_data == x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: return (m_entity2locator_traffic == x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: return (m_entity_count == x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: return (m_discovery_time == x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: return (m_sample_identity_count == x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: return (m_physical_data == x.m_physical_data); break; @@ -2565,16 +2568,16 @@ bool Data::operator !=( } void Data::_d( - eprosima::fastdds::statistics::EventKind __d) + uint32_t __d) { bool b = false; switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: switch (__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2583,10 +2586,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: switch (__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2595,12 +2598,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: switch (__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2609,12 +2612,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: switch (__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2623,24 +2626,24 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: switch (__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -2649,10 +2652,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: switch (__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -2661,10 +2664,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: switch (__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -2673,10 +2676,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: switch (__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -2696,12 +2699,12 @@ void Data::_d( m__d = __d; } -eprosima::fastdds::statistics::EventKind Data::_d() const +uint32_t Data::_d() const { return m__d; } -eprosima::fastdds::statistics::EventKind& Data::_d() +uint32_t& Data::_d() { return m__d; } @@ -2710,7 +2713,7 @@ void Data::writer_reader_data( const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data) { m_writer_reader_data = _writer_reader_data; - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -2718,7 +2721,7 @@ void Data::writer_reader_data( eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data) { m_writer_reader_data = std::move(_writer_reader_data); - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -2728,7 +2731,7 @@ const eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data( switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2749,7 +2752,7 @@ eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data() switch (m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -2769,7 +2772,7 @@ void Data::locator2locator_data( const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data) { m_locator2locator_data = _locator2locator_data; - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -2777,7 +2780,7 @@ void Data::locator2locator_data( eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data) { m_locator2locator_data = std::move(_locator2locator_data); - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -2787,7 +2790,7 @@ const eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_ switch (m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2808,7 +2811,7 @@ eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_data() switch (m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -2828,7 +2831,7 @@ void Data::entity_data( const eprosima::fastdds::statistics::EntityData& _entity_data) { m_entity_data = _entity_data; - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -2836,7 +2839,7 @@ void Data::entity_data( eprosima::fastdds::statistics::EntityData&& _entity_data) { m_entity_data = std::move(_entity_data); - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -2846,8 +2849,8 @@ const eprosima::fastdds::statistics::EntityData& Data::entity_data() const switch (m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2868,8 +2871,8 @@ eprosima::fastdds::statistics::EntityData& Data::entity_data() switch (m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -2889,7 +2892,7 @@ void Data::entity2locator_traffic( const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic) { m_entity2locator_traffic = _entity2locator_traffic; - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -2897,7 +2900,7 @@ void Data::entity2locator_traffic( eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic) { m_entity2locator_traffic = std::move(_entity2locator_traffic); - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -2907,8 +2910,8 @@ const eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator switch (m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2929,8 +2932,8 @@ eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator_traff switch (m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -2950,7 +2953,7 @@ void Data::entity_count( const eprosima::fastdds::statistics::EntityCount& _entity_count) { m_entity_count = _entity_count; - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -2958,7 +2961,7 @@ void Data::entity_count( eprosima::fastdds::statistics::EntityCount&& _entity_count) { m_entity_count = std::move(_entity_count); - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -2968,14 +2971,14 @@ const eprosima::fastdds::statistics::EntityCount& Data::entity_count() const switch (m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -2996,14 +2999,14 @@ eprosima::fastdds::statistics::EntityCount& Data::entity_count() switch (m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -3023,7 +3026,7 @@ void Data::discovery_time( const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time) { m_discovery_time = _discovery_time; - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -3031,7 +3034,7 @@ void Data::discovery_time( eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time) { m_discovery_time = std::move(_discovery_time); - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -3041,7 +3044,7 @@ const eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() const switch (m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3062,7 +3065,7 @@ eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() switch (m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3082,7 +3085,7 @@ void Data::sample_identity_count( const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count) { m_sample_identity_count = _sample_identity_count; - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -3090,7 +3093,7 @@ void Data::sample_identity_count( eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count) { m_sample_identity_count = std::move(_sample_identity_count); - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -3100,7 +3103,7 @@ const eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_ switch (m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3121,7 +3124,7 @@ eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_count( switch (m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3141,7 +3144,7 @@ void Data::physical_data( const eprosima::fastdds::statistics::PhysicalData& _physical_data) { m_physical_data = _physical_data; - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -3149,7 +3152,7 @@ void Data::physical_data( eprosima::fastdds::statistics::PhysicalData&& _physical_data) { m_physical_data = std::move(_physical_data); - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -3159,7 +3162,7 @@ const eprosima::fastdds::statistics::PhysicalData& Data::physical_data() const switch (m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -3180,7 +3183,7 @@ eprosima::fastdds::statistics::PhysicalData& Data::physical_data() switch (m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: diff --git a/test/blackbox/types/statistics/types.h b/test/blackbox/types/statistics/types.h index c51a79f2044..b67fc919497 100644 --- a/test/blackbox/types/statistics/types.h +++ b/test/blackbox/types/statistics/types.h @@ -1966,31 +1966,27 @@ class PhysicalData std::string m_process; }; -/*! - * @brief This enumeration represents the EventKind bitflags defined by the user in the IDL file. - * @ingroup types - */ -enum EventKindBits : uint32_t -{ - HISTORY2HISTORY_LATENCY = 0x01ull << 0, - NETWORK_LATENCY = 0x01ull << 1, - PUBLICATION_THROUGHPUT = 0x01ull << 2, - SUBSCRIPTION_THROUGHPUT = 0x01ull << 3, - RTPS_SENT = 0x01ull << 4, - RTPS_LOST = 0x01ull << 5, - RESENT_DATAS = 0x01ull << 6, - HEARTBEAT_COUNT = 0x01ull << 7, - ACKNACK_COUNT = 0x01ull << 8, - NACKFRAG_COUNT = 0x01ull << 9, - GAP_COUNT = 0x01ull << 10, - DATA_COUNT = 0x01ull << 11, - PDP_PACKETS = 0x01ull << 12, - EDP_PACKETS = 0x01ull << 13, - DISCOVERED_ENTITY = 0x01ull << 14, - SAMPLE_DATAS = 0x01ull << 15, - PHYSICAL_DATA = 0x01ull << 16 -}; -typedef uint32_t EventKind; +namespace EventKind { + +const uint32_t HISTORY2HISTORY_LATENCY = 1; +const uint32_t NETWORK_LATENCY = 2; +const uint32_t PUBLICATION_THROUGHPUT = 4; +const uint32_t SUBSCRIPTION_THROUGHPUT = 8; +const uint32_t RTPS_SENT = 16; +const uint32_t RTPS_LOST = 32; +const uint32_t RESENT_DATAS = 64; +const uint32_t HEARTBEAT_COUNT = 128; +const uint32_t ACKNACK_COUNT = 256; +const uint32_t NACKFRAG_COUNT = 512; +const uint32_t GAP_COUNT = 1024; +const uint32_t DATA_COUNT = 2048; +const uint32_t PDP_PACKETS = 4096; +const uint32_t EDP_PACKETS = 8192; +const uint32_t DISCOVERED_ENTITY = 16384; +const uint32_t SAMPLE_DATAS = 32768; +const uint32_t PHYSICAL_DATA = 65536; + +} // namespace EventKind /*! @@ -2059,19 +2055,19 @@ class Data * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ eProsima_user_DllExport void _d( - eprosima::fastdds::statistics::EventKind __d); + uint32_t __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const; + eProsima_user_DllExport uint32_t _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d(); + eProsima_user_DllExport uint32_t& _d(); /*! * @brief This function copies the value in member writer_reader_data @@ -2306,7 +2302,7 @@ class Data private: - eprosima::fastdds::statistics::EventKind m__d; + uint32_t m__d; eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data; eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data; diff --git a/test/blackbox/types/statistics/typesCdrAux.hpp b/test/blackbox/types/statistics/typesCdrAux.hpp index 92b36ffa689..84dea0ade66 100644 --- a/test/blackbox/types/statistics/typesCdrAux.hpp +++ b/test/blackbox/types/statistics/typesCdrAux.hpp @@ -30,7 +30,6 @@ constexpr uint32_t eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesiz constexpr uint32_t eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize {812UL}; constexpr uint32_t eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize {28UL}; - constexpr uint32_t eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize {28UL}; constexpr uint32_t eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize {0UL}; @@ -169,6 +168,40 @@ eProsima_user_DllExport void serialize_key( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } // namespace fastcdr } // namespace eprosima diff --git a/test/blackbox/types/statistics/typesCdrAux.ipp b/test/blackbox/types/statistics/typesCdrAux.ipp index 28b168d672d..4c0055ba1fb 100644 --- a/test/blackbox/types/statistics/typesCdrAux.ipp +++ b/test/blackbox/types/statistics/typesCdrAux.ipp @@ -1473,6 +1473,40 @@ void serialize_key( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + template<> eProsima_user_DllExport size_t calculate_serialized_size( eprosima::fastcdr::CdrSizeCalculator& calculator, @@ -1495,51 +1529,51 @@ eProsima_user_DllExport size_t calculate_serialized_size( switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(1), data.writer_reader_data(), current_alignment); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(2), data.locator2locator_data(), current_alignment); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(3), data.entity_data(), current_alignment); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(4), data.entity2locator_traffic(), current_alignment); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(5), data.entity_count(), current_alignment); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(6), data.discovery_time(), current_alignment); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(7), data.sample_identity_count(), current_alignment); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(8), data.physical_data(), current_alignment); break; @@ -1571,44 +1605,44 @@ eProsima_user_DllExport void serialize( switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: scdr << eprosima::fastcdr::MemberId(1) << data.writer_reader_data(); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: scdr << eprosima::fastcdr::MemberId(2) << data.locator2locator_data(); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: scdr << eprosima::fastcdr::MemberId(3) << data.entity_data(); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: scdr << eprosima::fastcdr::MemberId(4) << data.entity2locator_traffic(); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: scdr << eprosima::fastcdr::MemberId(5) << data.entity_count(); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: scdr << eprosima::fastcdr::MemberId(6) << data.discovery_time(); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: scdr << eprosima::fastcdr::MemberId(7) << data.sample_identity_count(); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: scdr << eprosima::fastcdr::MemberId(8) << data.physical_data(); break; @@ -1640,44 +1674,44 @@ eProsima_user_DllExport void deserialize( default: switch (data._d()) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: dcdr >> data.writer_reader_data(); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: dcdr >> data.locator2locator_data(); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: dcdr >> data.entity_data(); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: dcdr >> data.entity2locator_traffic(); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: dcdr >> data.entity_count(); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: dcdr >> data.discovery_time(); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: dcdr >> data.sample_identity_count(); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: dcdr >> data.physical_data(); break; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index 5d92b732491..32d3d775779 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -2696,6 +2696,43 @@ namespace eprosima { return true; } + namespace EventKind { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } //End of namespace EventKind diff --git a/test/blackbox/types/statistics/typesPubSubTypes.h b/test/blackbox/types/statistics/typesPubSubTypes.h index 4cee82044c4..4f1c0b0b272 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.h +++ b/test/blackbox/types/statistics/typesPubSubTypes.h @@ -37,1279 +37,1319 @@ Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // GEN_API_VER -namespace eprosima { -namespace fastdds { -namespace statistics { -namespace detail { +namespace eprosima +{ + namespace fastdds + { + namespace statistics + { + namespace detail + { -/*! - * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file. - * @ingroup types - */ -class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file. + * @ingroup types + */ + class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityId_s type; + typedef EntityId_s type; - eProsima_user_DllExport EntityId_sPubSubType(); + eProsima_user_DllExport EntityId_sPubSubType(); - eProsima_user_DllExport ~EntityId_sPubSubType() override; + eProsima_user_DllExport ~EntityId_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file. - * @ingroup types - */ -class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file. + * @ingroup types + */ + class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef GuidPrefix_s type; + typedef GuidPrefix_s type; - eProsima_user_DllExport GuidPrefix_sPubSubType(); + eProsima_user_DllExport GuidPrefix_sPubSubType(); - eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; + eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file. - * @ingroup types - */ -class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file. + * @ingroup types + */ + class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef GUID_s type; + typedef GUID_s type; - eProsima_user_DllExport GUID_sPubSubType(); + eProsima_user_DllExport GUID_sPubSubType(); - eProsima_user_DllExport ~GUID_sPubSubType() override; + eProsima_user_DllExport ~GUID_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file. - * @ingroup types - */ -class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file. + * @ingroup types + */ + class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SequenceNumber_s type; + typedef SequenceNumber_s type; - eProsima_user_DllExport SequenceNumber_sPubSubType(); + eProsima_user_DllExport SequenceNumber_sPubSubType(); - eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; + eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file. - * @ingroup types - */ -class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file. + * @ingroup types + */ + class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SampleIdentity_s type; + typedef SampleIdentity_s type; - eProsima_user_DllExport SampleIdentity_sPubSubType(); + eProsima_user_DllExport SampleIdentity_sPubSubType(); - eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; + eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file. - * @ingroup types - */ -class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file. + * @ingroup types + */ + class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Locator_s type; + typedef Locator_s type; - eProsima_user_DllExport Locator_sPubSubType(); + eProsima_user_DllExport Locator_sPubSubType(); - eProsima_user_DllExport ~Locator_sPubSubType() override; + eProsima_user_DllExport ~Locator_sPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; -} // namespace detail + }; + } -/*! - * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file. - * @ingroup types - */ -class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file. + * @ingroup types + */ + class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef DiscoveryTime type; + typedef DiscoveryTime type; - eProsima_user_DllExport DiscoveryTimePubSubType(); + eProsima_user_DllExport DiscoveryTimePubSubType(); - eProsima_user_DllExport ~DiscoveryTimePubSubType() override; + eProsima_user_DllExport ~DiscoveryTimePubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file. - * @ingroup types - */ -class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file. + * @ingroup types + */ + class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityCount type; + typedef EntityCount type; - eProsima_user_DllExport EntityCountPubSubType(); + eProsima_user_DllExport EntityCountPubSubType(); - eProsima_user_DllExport ~EntityCountPubSubType() override; + eProsima_user_DllExport ~EntityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file. - * @ingroup types - */ -class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file. + * @ingroup types + */ + class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef SampleIdentityCount type; + typedef SampleIdentityCount type; - eProsima_user_DllExport SampleIdentityCountPubSubType(); + eProsima_user_DllExport SampleIdentityCountPubSubType(); - eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; + eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file. - * @ingroup types - */ -class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file. + * @ingroup types + */ + class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Entity2LocatorTraffic type; + typedef Entity2LocatorTraffic type; - eProsima_user_DllExport Entity2LocatorTrafficPubSubType(); + eProsima_user_DllExport Entity2LocatorTrafficPubSubType(); - eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; + eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file. - * @ingroup types - */ -class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file. + * @ingroup types + */ + class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef WriterReaderData type; + typedef WriterReaderData type; - eProsima_user_DllExport WriterReaderDataPubSubType(); + eProsima_user_DllExport WriterReaderDataPubSubType(); - eProsima_user_DllExport ~WriterReaderDataPubSubType() override; + eProsima_user_DllExport ~WriterReaderDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file. - * @ingroup types - */ -class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file. + * @ingroup types + */ + class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef Locator2LocatorData type; + typedef Locator2LocatorData type; - eProsima_user_DllExport Locator2LocatorDataPubSubType(); + eProsima_user_DllExport Locator2LocatorDataPubSubType(); - eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; + eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file. - * @ingroup types - */ -class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file. + * @ingroup types + */ + class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef EntityData type; + typedef EntityData type; - eProsima_user_DllExport EntityDataPubSubType(); + eProsima_user_DllExport EntityDataPubSubType(); - eProsima_user_DllExport ~EntityDataPubSubType() override; + eProsima_user_DllExport ~EntityDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file. - * @ingroup types - */ -class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file. + * @ingroup types + */ + class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef PhysicalData type; + typedef PhysicalData type; - eProsima_user_DllExport PhysicalDataPubSubType(); + eProsima_user_DllExport PhysicalDataPubSubType(); - eProsima_user_DllExport ~PhysicalDataPubSubType() override; + eProsima_user_DllExport ~PhysicalDataPubSubType() override; - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + { + return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport bool serialize( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + void* data, + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastrtps::rtps::SerializedPayload_t* payload, + void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data) override + { + return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); + } - eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport std::function getSerializedSizeProvider( + void* data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( - void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool getKey( + void* data, + eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* createData() override; - eProsima_user_DllExport void deleteData( - void* data) override; + eProsima_user_DllExport void deleteData( + void* data) override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } - - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain() const override + { + return false; + } + + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; - unsigned char* m_keyBuffer; + MD5 m_md5; + unsigned char* m_keyBuffer; + + }; + namespace EventKind + { + -}; -} // namespace statistics -} // namespace fastdds -} // namespace eprosima + + + + + + + + + + + + + + + + + + + + + + + + + + + + } + + + + + } + } +} #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_ diff --git a/test/blackbox/types/statistics/typesv1.cxx b/test/blackbox/types/statistics/typesv1.cxx index 80c55edc2e6..ed4305447f1 100644 --- a/test/blackbox/types/statistics/typesv1.cxx +++ b/test/blackbox/types/statistics/typesv1.cxx @@ -85,7 +85,6 @@ struct FindType { #define eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize 852ULL; #define eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize 812ULL; - #define eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize 28ULL; #define eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize 16ULL; @@ -3529,12 +3528,15 @@ std::string& PhysicalData::process() +namespace EventKind { + +} // namespace EventKind Data::Data() { - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; // eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data // eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data @@ -3564,51 +3566,51 @@ Data::Data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -3624,58 +3626,58 @@ Data::Data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -3692,51 +3694,51 @@ Data& Data::operator =( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = x.m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = x.m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = x.m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = x.m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = x.m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = x.m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = x.m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = x.m_physical_data; break; @@ -3754,58 +3756,58 @@ Data& Data::operator =( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: m_writer_reader_data = std::move(x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: m_locator2locator_data = std::move(x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: m_entity_data = std::move(x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: m_entity2locator_traffic = std::move(x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: m_entity_count = std::move(x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: m_discovery_time = std::move(x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: m_sample_identity_count = std::move(x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: m_physical_data = std::move(x.m_physical_data); break; @@ -3827,51 +3829,51 @@ bool Data::operator ==( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: return (m_writer_reader_data == x.m_writer_reader_data); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: return (m_locator2locator_data == x.m_locator2locator_data); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: return (m_entity_data == x.m_entity_data); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: return (m_entity2locator_traffic == x.m_entity2locator_traffic); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: return (m_entity_count == x.m_entity_count); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: return (m_discovery_time == x.m_discovery_time); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: return (m_sample_identity_count == x.m_sample_identity_count); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: return (m_physical_data == x.m_physical_data); break; @@ -3888,16 +3890,16 @@ bool Data::operator !=( } void Data::_d( - eprosima::fastdds::statistics::EventKind __d) + uint32_t __d) { bool b = false; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: switch(__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -3906,10 +3908,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: switch(__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -3918,12 +3920,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: switch(__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -3932,12 +3934,12 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: switch(__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -3946,24 +3948,24 @@ void Data::_d( break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: switch(__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -3972,10 +3974,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: switch(__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -3984,10 +3986,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: switch(__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -3996,10 +3998,10 @@ void Data::_d( break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: switch(__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4017,12 +4019,12 @@ void Data::_d( m__d = __d; } -eprosima::fastdds::statistics::EventKind Data::_d() const +uint32_t Data::_d() const { return m__d; } -eprosima::fastdds::statistics::EventKind& Data::_d() +uint32_t& Data::_d() { return m__d; } @@ -4031,7 +4033,7 @@ void Data::writer_reader_data( const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data) { m_writer_reader_data = _writer_reader_data; - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -4039,7 +4041,7 @@ void Data::writer_reader_data( eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data) { m_writer_reader_data = std::move(_writer_reader_data); - m__d = eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY; + m__d = EventKind::HISTORY2HISTORY_LATENCY; } @@ -4049,7 +4051,7 @@ const eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data( switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -4070,7 +4072,7 @@ eprosima::fastdds::statistics::WriterReaderData& Data::writer_reader_data() switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: b = true; break; default: @@ -4090,7 +4092,7 @@ void Data::locator2locator_data( const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data) { m_locator2locator_data = _locator2locator_data; - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -4098,7 +4100,7 @@ void Data::locator2locator_data( eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data) { m_locator2locator_data = std::move(_locator2locator_data); - m__d = eprosima::fastdds::statistics::NETWORK_LATENCY; + m__d = EventKind::NETWORK_LATENCY; } @@ -4108,7 +4110,7 @@ const eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_ switch(m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -4129,7 +4131,7 @@ eprosima::fastdds::statistics::Locator2LocatorData& Data::locator2locator_data() switch(m__d) { - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: b = true; break; default: @@ -4149,7 +4151,7 @@ void Data::entity_data( const eprosima::fastdds::statistics::EntityData& _entity_data) { m_entity_data = _entity_data; - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -4157,7 +4159,7 @@ void Data::entity_data( eprosima::fastdds::statistics::EntityData&& _entity_data) { m_entity_data = std::move(_entity_data); - m__d = eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT; + m__d = EventKind::PUBLICATION_THROUGHPUT; } @@ -4167,8 +4169,8 @@ const eprosima::fastdds::statistics::EntityData& Data::entity_data() const switch(m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -4189,8 +4191,8 @@ eprosima::fastdds::statistics::EntityData& Data::entity_data() switch(m__d) { - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: b = true; break; default: @@ -4210,7 +4212,7 @@ void Data::entity2locator_traffic( const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic) { m_entity2locator_traffic = _entity2locator_traffic; - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -4218,7 +4220,7 @@ void Data::entity2locator_traffic( eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic) { m_entity2locator_traffic = std::move(_entity2locator_traffic); - m__d = eprosima::fastdds::statistics::RTPS_SENT; + m__d = EventKind::RTPS_SENT; } @@ -4228,8 +4230,8 @@ const eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator switch(m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -4250,8 +4252,8 @@ eprosima::fastdds::statistics::Entity2LocatorTraffic& Data::entity2locator_traff switch(m__d) { - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: b = true; break; default: @@ -4271,7 +4273,7 @@ void Data::entity_count( const eprosima::fastdds::statistics::EntityCount& _entity_count) { m_entity_count = _entity_count; - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -4279,7 +4281,7 @@ void Data::entity_count( eprosima::fastdds::statistics::EntityCount&& _entity_count) { m_entity_count = std::move(_entity_count); - m__d = eprosima::fastdds::statistics::RESENT_DATAS; + m__d = EventKind::RESENT_DATAS; } @@ -4289,14 +4291,14 @@ const eprosima::fastdds::statistics::EntityCount& Data::entity_count() const switch(m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -4317,14 +4319,14 @@ eprosima::fastdds::statistics::EntityCount& Data::entity_count() switch(m__d) { - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: b = true; break; default: @@ -4344,7 +4346,7 @@ void Data::discovery_time( const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time) { m_discovery_time = _discovery_time; - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -4352,7 +4354,7 @@ void Data::discovery_time( eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time) { m_discovery_time = std::move(_discovery_time); - m__d = eprosima::fastdds::statistics::DISCOVERED_ENTITY; + m__d = EventKind::DISCOVERED_ENTITY; } @@ -4362,7 +4364,7 @@ const eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() const switch(m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -4383,7 +4385,7 @@ eprosima::fastdds::statistics::DiscoveryTime& Data::discovery_time() switch(m__d) { - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: b = true; break; default: @@ -4403,7 +4405,7 @@ void Data::sample_identity_count( const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count) { m_sample_identity_count = _sample_identity_count; - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -4411,7 +4413,7 @@ void Data::sample_identity_count( eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count) { m_sample_identity_count = std::move(_sample_identity_count); - m__d = eprosima::fastdds::statistics::SAMPLE_DATAS; + m__d = EventKind::SAMPLE_DATAS; } @@ -4421,7 +4423,7 @@ const eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_ switch(m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -4442,7 +4444,7 @@ eprosima::fastdds::statistics::SampleIdentityCount& Data::sample_identity_count( switch(m__d) { - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: b = true; break; default: @@ -4462,7 +4464,7 @@ void Data::physical_data( const eprosima::fastdds::statistics::PhysicalData& _physical_data) { m_physical_data = _physical_data; - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -4470,7 +4472,7 @@ void Data::physical_data( eprosima::fastdds::statistics::PhysicalData&& _physical_data) { m_physical_data = std::move(_physical_data); - m__d = eprosima::fastdds::statistics::PHYSICAL_DATA; + m__d = EventKind::PHYSICAL_DATA; } @@ -4480,7 +4482,7 @@ const eprosima::fastdds::statistics::PhysicalData& Data::physical_data() const switch(m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4501,7 +4503,7 @@ eprosima::fastdds::statistics::PhysicalData& Data::physical_data() switch(m__d) { - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: b = true; break; default: @@ -4525,61 +4527,64 @@ size_t Data::getCdrSerializedSize( (void)data; size_t initial_alignment = current_alignment; + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + + switch(data.m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: current_alignment += eprosima::fastdds::statistics::WriterReaderData::getCdrSerializedSize(data.writer_reader_data(), current_alignment); break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: current_alignment += eprosima::fastdds::statistics::Locator2LocatorData::getCdrSerializedSize(data.locator2locator_data(), current_alignment); break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: current_alignment += eprosima::fastdds::statistics::EntityData::getCdrSerializedSize(data.entity_data(), current_alignment); break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: current_alignment += eprosima::fastdds::statistics::Entity2LocatorTraffic::getCdrSerializedSize(data.entity2locator_traffic(), current_alignment); break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: current_alignment += eprosima::fastdds::statistics::EntityCount::getCdrSerializedSize(data.entity_count(), current_alignment); break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: current_alignment += eprosima::fastdds::statistics::DiscoveryTime::getCdrSerializedSize(data.discovery_time(), current_alignment); break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: current_alignment += eprosima::fastdds::statistics::SampleIdentityCount::getCdrSerializedSize(data.sample_identity_count(), current_alignment); break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: current_alignment += eprosima::fastdds::statistics::PhysicalData::getCdrSerializedSize(data.physical_data(), current_alignment); break; @@ -4595,62 +4600,62 @@ size_t Data::getCdrSerializedSize( void Data::serialize( eprosima::fastcdr::Cdr& scdr) const { - scdr << (uint32_t)m__d; + scdr << m__d; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: scdr << m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: scdr << m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: scdr << m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: scdr << m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: scdr << m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: scdr << m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: scdr << m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: scdr << m_physical_data; break; @@ -4663,75 +4668,70 @@ void Data::serialize( void Data::deserialize( eprosima::fastcdr::Cdr& dcdr) { - { - uint32_t bitmask_value = 0; - dcdr >> bitmask_value; - m__d = (eprosima::fastdds::statistics::EventKind)bitmask_value; - } - + dcdr >> m__d; switch(m__d) { - case eprosima::fastdds::statistics::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: dcdr >> m_writer_reader_data; break; - case eprosima::fastdds::statistics::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: dcdr >> m_locator2locator_data; break; - case eprosima::fastdds::statistics::PUBLICATION_THROUGHPUT: - case eprosima::fastdds::statistics::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: dcdr >> m_entity_data; break; - case eprosima::fastdds::statistics::RTPS_SENT: - case eprosima::fastdds::statistics::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: dcdr >> m_entity2locator_traffic; break; - case eprosima::fastdds::statistics::RESENT_DATAS: - case eprosima::fastdds::statistics::HEARTBEAT_COUNT: - case eprosima::fastdds::statistics::ACKNACK_COUNT: - case eprosima::fastdds::statistics::NACKFRAG_COUNT: - case eprosima::fastdds::statistics::GAP_COUNT: - case eprosima::fastdds::statistics::DATA_COUNT: - case eprosima::fastdds::statistics::PDP_PACKETS: - case eprosima::fastdds::statistics::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: dcdr >> m_entity_count; break; - case eprosima::fastdds::statistics::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: dcdr >> m_discovery_time; break; - case eprosima::fastdds::statistics::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: dcdr >> m_sample_identity_count; break; - case eprosima::fastdds::statistics::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: dcdr >> m_physical_data; diff --git a/test/blackbox/types/statistics/typesv1.h b/test/blackbox/types/statistics/typesv1.h index ab918b661cc..5bf56607a1c 100644 --- a/test/blackbox/types/statistics/typesv1.h +++ b/test/blackbox/types/statistics/typesv1.h @@ -2699,31 +2699,42 @@ namespace eprosima { }; - /*! - * @brief This class represents the bitmask EventKind defined by the user in the IDL file. - * @ingroup types - */ - enum EventKindBits : uint32_t - { - HISTORY2HISTORY_LATENCY = 0x01ull << 0, - NETWORK_LATENCY = 0x01ull << 1, - PUBLICATION_THROUGHPUT = 0x01ull << 2, - SUBSCRIPTION_THROUGHPUT = 0x01ull << 3, - RTPS_SENT = 0x01ull << 4, - RTPS_LOST = 0x01ull << 5, - RESENT_DATAS = 0x01ull << 6, - HEARTBEAT_COUNT = 0x01ull << 7, - ACKNACK_COUNT = 0x01ull << 8, - NACKFRAG_COUNT = 0x01ull << 9, - GAP_COUNT = 0x01ull << 10, - DATA_COUNT = 0x01ull << 11, - PDP_PACKETS = 0x01ull << 12, - EDP_PACKETS = 0x01ull << 13, - DISCOVERED_ENTITY = 0x01ull << 14, - SAMPLE_DATAS = 0x01ull << 15, - PHYSICAL_DATA = 0x01ull << 16 - }; - typedef uint32_t EventKind; + namespace EventKind { + const uint32_t HISTORY2HISTORY_LATENCY = 1; + + const uint32_t NETWORK_LATENCY = 2; + + const uint32_t PUBLICATION_THROUGHPUT = 4; + + const uint32_t SUBSCRIPTION_THROUGHPUT = 8; + + const uint32_t RTPS_SENT = 16; + + const uint32_t RTPS_LOST = 32; + + const uint32_t RESENT_DATAS = 64; + + const uint32_t HEARTBEAT_COUNT = 128; + + const uint32_t ACKNACK_COUNT = 256; + + const uint32_t NACKFRAG_COUNT = 512; + + const uint32_t GAP_COUNT = 1024; + + const uint32_t DATA_COUNT = 2048; + + const uint32_t PDP_PACKETS = 4096; + + const uint32_t EDP_PACKETS = 8192; + + const uint32_t DISCOVERED_ENTITY = 16384; + + const uint32_t SAMPLE_DATAS = 32768; + + const uint32_t PHYSICAL_DATA = 65536; + + } // namespace EventKind /*! @@ -2792,19 +2803,19 @@ namespace eprosima { * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ eProsima_user_DllExport void _d( - eprosima::fastdds::statistics::EventKind __d); + uint32_t __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const; + eProsima_user_DllExport uint32_t _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d(); + eProsima_user_DllExport uint32_t& _d(); /*! * @brief This function copies the value in member writer_reader_data @@ -3070,7 +3081,7 @@ namespace eprosima { private: - eprosima::fastdds::statistics::EventKind m__d; + uint32_t m__d; eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data; eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data; diff --git a/test/unittest/dynamic_types/idl/Testv1.cxx b/test/unittest/dynamic_types/idl/Testv1.cxx index 5f78d5ee9b8..743f1f036f6 100644 --- a/test/unittest/dynamic_types/idl/Testv1.cxx +++ b/test/unittest/dynamic_types/idl/Testv1.cxx @@ -3665,10 +3665,10 @@ void KeyedStruct::serializeKey( eprosima::fastcdr::Cdr& scdr) const { (void) scdr; - + scdr << m_key; - - + + } /*! diff --git a/test/unittest/dynamic_types/idl/new_features_4_2.h b/test/unittest/dynamic_types/idl/new_features_4_2.h index 46b31433105..de85dadf42c 100644 --- a/test/unittest/dynamic_types/idl/new_features_4_2.h +++ b/test/unittest/dynamic_types/idl/new_features_4_2.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/test/unittest/xtypes/idl/WideEnum.h b/test/unittest/xtypes/idl/WideEnum.h index fca5658734d..3a731aeb935 100644 --- a/test/unittest/xtypes/idl/WideEnum.h +++ b/test/unittest/xtypes/idl/WideEnum.h @@ -34,10 +34,12 @@ #include #include +#include #include #include + #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) #define eProsima_user_DllExport __declspec( dllexport ) From b3f47eed0cca8e10b3e4be0b9764c7b74786f21d Mon Sep 17 00:00:00 2001 From: JLBuenoLopez-eProsima Date: Mon, 1 Apr 2024 11:27:20 +0200 Subject: [PATCH 3/3] Refs #20714: correctly use new statistics IDL Signed-off-by: JLBuenoLopez-eProsima --- .../fastdds/domain/DomainParticipantImpl.cpp | 48 +++--- .../fastdds/domain/DomainParticipantImpl.hpp | 2 +- .../DomainParticipantStatisticsListener.cpp | 38 ++-- .../DomainParticipantStatisticsListener.hpp | 4 +- src/cpp/statistics/rtps/GuidUtils.hpp | 2 +- src/cpp/statistics/rtps/StatisticsBase.cpp | 38 ++-- .../rtps/reader/StatisticsReaderImpl.cpp | 14 +- .../rtps/writer/StatisticsWriterImpl.cpp | 18 +- ...mainParticipantStatisticsListenerTests.cpp | 38 ++-- .../statistics/rtps/RTPSStatisticsTests.cpp | 162 +++++++++--------- 10 files changed, 182 insertions(+), 182 deletions(-) diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp index df3ef6941f4..ca7657447a3 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp @@ -79,36 +79,36 @@ constexpr const char* PHYSICAL_DATA_TOPIC_ALIAS = "PHYSICAL_DATA_TOPIC"; constexpr const char* MONITOR_SERVICE_TOPIC_ALIAS = "MONITOR_SERVICE_TOPIC"; static constexpr uint32_t participant_statistics_mask = - EventKindBits::RTPS_SENT | EventKindBits::RTPS_LOST | EventKindBits::NETWORK_LATENCY | - EventKindBits::EDP_PACKETS | EventKindBits::PDP_PACKETS | - EventKindBits::PHYSICAL_DATA | EventKindBits::DISCOVERED_ENTITY; + EventKind::RTPS_SENT | EventKind::RTPS_LOST | EventKind::NETWORK_LATENCY | + EventKind::EDP_PACKETS | EventKind::PDP_PACKETS | + EventKind::PHYSICAL_DATA | EventKind::DISCOVERED_ENTITY; struct ValidEntry { const char* alias; const char* name; - EventKind event_kind; + uint32_t event_kind; }; static const ValidEntry valid_entries[] = { - {HISTORY_LATENCY_TOPIC_ALIAS, HISTORY_LATENCY_TOPIC, HISTORY2HISTORY_LATENCY}, - {NETWORK_LATENCY_TOPIC_ALIAS, NETWORK_LATENCY_TOPIC, NETWORK_LATENCY}, - {PUBLICATION_THROUGHPUT_TOPIC_ALIAS, PUBLICATION_THROUGHPUT_TOPIC, PUBLICATION_THROUGHPUT}, - {SUBSCRIPTION_THROUGHPUT_TOPIC_ALIAS, SUBSCRIPTION_THROUGHPUT_TOPIC, SUBSCRIPTION_THROUGHPUT}, - {RTPS_SENT_TOPIC_ALIAS, RTPS_SENT_TOPIC, RTPS_SENT}, - {RTPS_LOST_TOPIC_ALIAS, RTPS_LOST_TOPIC, RTPS_LOST}, - {RESENT_DATAS_TOPIC_ALIAS, RESENT_DATAS_TOPIC, RESENT_DATAS}, - {HEARTBEAT_COUNT_TOPIC_ALIAS, HEARTBEAT_COUNT_TOPIC, HEARTBEAT_COUNT}, - {ACKNACK_COUNT_TOPIC_ALIAS, ACKNACK_COUNT_TOPIC, ACKNACK_COUNT}, - {NACKFRAG_COUNT_TOPIC_ALIAS, NACKFRAG_COUNT_TOPIC, NACKFRAG_COUNT}, - {GAP_COUNT_TOPIC_ALIAS, GAP_COUNT_TOPIC, GAP_COUNT}, - {DATA_COUNT_TOPIC_ALIAS, DATA_COUNT_TOPIC, DATA_COUNT}, - {PDP_PACKETS_TOPIC_ALIAS, PDP_PACKETS_TOPIC, PDP_PACKETS}, - {EDP_PACKETS_TOPIC_ALIAS, EDP_PACKETS_TOPIC, EDP_PACKETS}, - {DISCOVERY_TOPIC_ALIAS, DISCOVERY_TOPIC, DISCOVERED_ENTITY}, - {SAMPLE_DATAS_TOPIC_ALIAS, SAMPLE_DATAS_TOPIC, SAMPLE_DATAS}, - {PHYSICAL_DATA_TOPIC_ALIAS, PHYSICAL_DATA_TOPIC, PHYSICAL_DATA} + {HISTORY_LATENCY_TOPIC_ALIAS, HISTORY_LATENCY_TOPIC, EventKind::HISTORY2HISTORY_LATENCY}, + {NETWORK_LATENCY_TOPIC_ALIAS, NETWORK_LATENCY_TOPIC, EventKind::NETWORK_LATENCY}, + {PUBLICATION_THROUGHPUT_TOPIC_ALIAS, PUBLICATION_THROUGHPUT_TOPIC, EventKind::PUBLICATION_THROUGHPUT}, + {SUBSCRIPTION_THROUGHPUT_TOPIC_ALIAS, SUBSCRIPTION_THROUGHPUT_TOPIC, EventKind::SUBSCRIPTION_THROUGHPUT}, + {RTPS_SENT_TOPIC_ALIAS, RTPS_SENT_TOPIC, EventKind::RTPS_SENT}, + {RTPS_LOST_TOPIC_ALIAS, RTPS_LOST_TOPIC, EventKind::RTPS_LOST}, + {RESENT_DATAS_TOPIC_ALIAS, RESENT_DATAS_TOPIC, EventKind::RESENT_DATAS}, + {HEARTBEAT_COUNT_TOPIC_ALIAS, HEARTBEAT_COUNT_TOPIC, EventKind::HEARTBEAT_COUNT}, + {ACKNACK_COUNT_TOPIC_ALIAS, ACKNACK_COUNT_TOPIC, EventKind::ACKNACK_COUNT}, + {NACKFRAG_COUNT_TOPIC_ALIAS, NACKFRAG_COUNT_TOPIC, EventKind::NACKFRAG_COUNT}, + {GAP_COUNT_TOPIC_ALIAS, GAP_COUNT_TOPIC, EventKind::GAP_COUNT}, + {DATA_COUNT_TOPIC_ALIAS, DATA_COUNT_TOPIC, EventKind::DATA_COUNT}, + {PDP_PACKETS_TOPIC_ALIAS, PDP_PACKETS_TOPIC, EventKind::PDP_PACKETS}, + {EDP_PACKETS_TOPIC_ALIAS, EDP_PACKETS_TOPIC, EventKind::EDP_PACKETS}, + {DISCOVERY_TOPIC_ALIAS, DISCOVERY_TOPIC, EventKind::DISCOVERED_ENTITY}, + {SAMPLE_DATAS_TOPIC_ALIAS, SAMPLE_DATAS_TOPIC, EventKind::SAMPLE_DATAS}, + {PHYSICAL_DATA_TOPIC_ALIAS, PHYSICAL_DATA_TOPIC, EventKind::PHYSICAL_DATA} }; ReturnCode_t DomainParticipantImpl::enable_statistics_datawriter( @@ -116,7 +116,7 @@ ReturnCode_t DomainParticipantImpl::enable_statistics_datawriter( const efd::DataWriterQos& dwqos) { std::string use_topic_name; - EventKind event_kind; + uint32_t event_kind; if (!transform_and_check_topic_name(topic_name, use_topic_name, event_kind)) { return ReturnCode_t::RETCODE_BAD_PARAMETER; @@ -215,7 +215,7 @@ ReturnCode_t DomainParticipantImpl::disable_statistics_datawriter( { ReturnCode_t ret = ReturnCode_t::RETCODE_OK; std::string use_topic_name; - EventKind event_kind; + uint32_t event_kind; if (!transform_and_check_topic_name(topic_name, use_topic_name, event_kind)) { return ReturnCode_t::RETCODE_BAD_PARAMETER; @@ -499,7 +499,7 @@ bool DomainParticipantImpl::is_statistics_topic_name( bool DomainParticipantImpl::transform_and_check_topic_name( const std::string& topic_name_or_alias, std::string& topic_name, - EventKind& event_kind) noexcept + uint32_t& event_kind) noexcept { for (const ValidEntry& entry : valid_entries) { diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp index 0654d6000cf..6966bf63f85 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp @@ -246,7 +246,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, bool transform_and_check_topic_name( const std::string& topic_name_or_alias, std::string& topic_name, - EventKind& event_kind) noexcept; + uint32_t& event_kind) noexcept; /** * Auxiliary function to register the statistics type depending on the statistics topic name. diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.cpp index 0fb381db791..120570f0d22 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.cpp @@ -29,7 +29,7 @@ namespace statistics { namespace dds { void DomainParticipantStatisticsListener::set_datawriter( - EventKind kind, + uint32_t kind, DataWriter* writer) { std::lock_guard guard(mtx_); @@ -51,7 +51,7 @@ void DomainParticipantStatisticsListener::on_statistics_data( const Data& statistics_data) { DataWriter* writer = nullptr; - EventKind data_kind = statistics_data._d(); + uint32_t data_kind = statistics_data._d(); // Find corresponding writer { @@ -69,44 +69,44 @@ void DomainParticipantStatisticsListener::on_statistics_data( switch (data_kind) { - case EventKindBits::HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: data_sample = &statistics_data.writer_reader_data(); break; - case EventKindBits::NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: data_sample = &statistics_data.locator2locator_data(); break; - case EventKindBits::PUBLICATION_THROUGHPUT: - case EventKindBits::SUBSCRIPTION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: data_sample = &statistics_data.entity_data(); break; - case EventKindBits::RTPS_SENT: - case EventKindBits::RTPS_LOST: + case EventKind::RTPS_SENT: + case EventKind::RTPS_LOST: data_sample = &statistics_data.entity2locator_traffic(); break; - case EventKindBits::RESENT_DATAS: - case EventKindBits::HEARTBEAT_COUNT: - case EventKindBits::ACKNACK_COUNT: - case EventKindBits::NACKFRAG_COUNT: - case EventKindBits::GAP_COUNT: - case EventKindBits::DATA_COUNT: - case EventKindBits::PDP_PACKETS: - case EventKindBits::EDP_PACKETS: + case EventKind::RESENT_DATAS: + case EventKind::HEARTBEAT_COUNT: + case EventKind::ACKNACK_COUNT: + case EventKind::NACKFRAG_COUNT: + case EventKind::GAP_COUNT: + case EventKind::DATA_COUNT: + case EventKind::PDP_PACKETS: + case EventKind::EDP_PACKETS: data_sample = &statistics_data.entity_count(); break; - case EventKindBits::DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: data_sample = &statistics_data.discovery_time(); break; - case EventKindBits::SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: data_sample = &statistics_data.sample_identity_count(); break; - case EventKindBits::PHYSICAL_DATA: + case EventKind::PHYSICAL_DATA: data_sample = &statistics_data.physical_data(); break; } diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp index 7c8b2442201..dd03cf13eea 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp @@ -43,7 +43,7 @@ struct DomainParticipantStatisticsListener : public IListener using DataWriter = eprosima::fastdds::dds::DataWriter; void set_datawriter( - EventKind kind, + uint32_t kind, DataWriter* writer); void on_statistics_data( @@ -54,7 +54,7 @@ struct DomainParticipantStatisticsListener : public IListener private: std::mutex mtx_; - std::map writers_; + std::map writers_; std::atomic enabled_writers_mask_{0}; }; diff --git a/src/cpp/statistics/rtps/GuidUtils.hpp b/src/cpp/statistics/rtps/GuidUtils.hpp index 8f6cecac513..d15b3d0665f 100644 --- a/src/cpp/statistics/rtps/GuidUtils.hpp +++ b/src/cpp/statistics/rtps/GuidUtils.hpp @@ -46,7 +46,7 @@ inline bool is_statistics_builtin( * @param [out] entity_id The corresponding entity id. */ inline void set_statistics_entity_id( - EventKind kind, + uint32_t kind, fastrtps::rtps::EntityId_t& entity_id) { entity_id.value[3] = 0x62; diff --git a/src/cpp/statistics/rtps/StatisticsBase.cpp b/src/cpp/statistics/rtps/StatisticsBase.cpp index 5cbafa358c9..b12e5bbe418 100644 --- a/src/cpp/statistics/rtps/StatisticsBase.cpp +++ b/src/cpp/statistics/rtps/StatisticsBase.cpp @@ -210,12 +210,12 @@ bool StatisticsParticipantImpl::are_writers_involved( { using namespace fastdds::statistics; - constexpr uint32_t writers_maks = PUBLICATION_THROUGHPUT \ - | RESENT_DATAS \ - | HEARTBEAT_COUNT \ - | GAP_COUNT \ - | DATA_COUNT \ - | SAMPLE_DATAS; + constexpr uint32_t writers_maks = EventKind::PUBLICATION_THROUGHPUT \ + | EventKind::RESENT_DATAS \ + | EventKind::HEARTBEAT_COUNT \ + | EventKind::GAP_COUNT \ + | EventKind::DATA_COUNT \ + | EventKind::SAMPLE_DATAS; return writers_maks & mask; } @@ -225,10 +225,10 @@ bool StatisticsParticipantImpl::are_readers_involved( { using namespace fastdds::statistics; - constexpr uint32_t readers_maks = HISTORY2HISTORY_LATENCY \ - | SUBSCRIPTION_THROUGHPUT \ - | ACKNACK_COUNT \ - | NACKFRAG_COUNT; + constexpr uint32_t readers_maks = EventKind::HISTORY2HISTORY_LATENCY \ + | EventKind::SUBSCRIPTION_THROUGHPUT \ + | EventKind::ACKNACK_COUNT \ + | EventKind::NACKFRAG_COUNT; return readers_maks & mask; } @@ -394,7 +394,7 @@ void StatisticsParticipantImpl::process_network_timestamp( { using namespace eprosima::fastrtps::rtps; - if (!are_statistics_writers_enabled(EventKindBits::NETWORK_LATENCY)) + if (!are_statistics_writers_enabled(EventKind::NETWORK_LATENCY)) { return; } @@ -432,7 +432,7 @@ void StatisticsParticipantImpl::process_network_sequence( const rtps::StatisticsSubmessageData::Sequence& seq, uint64_t datagram_size) { - if (!are_statistics_writers_enabled(EventKindBits::RTPS_LOST)) + if (!are_statistics_writers_enabled(EventKind::RTPS_LOST)) { return; } @@ -490,7 +490,7 @@ void StatisticsParticipantImpl::process_network_sequence( Data data; // note that the setter sets RTPS_SENT by default data.entity2locator_traffic(notification); - data._d(EventKindBits::RTPS_LOST); + data._d(EventKind::RTPS_LOST); for_each_listener([&data](const Key& listener) { @@ -506,7 +506,7 @@ void StatisticsParticipantImpl::on_rtps_sent( using namespace std; using eprosima::fastrtps::rtps::RTPSParticipantImpl; - if (!are_statistics_writers_enabled(EventKindBits::RTPS_SENT)) + if (!are_statistics_writers_enabled(EventKind::RTPS_SENT)) { return; } @@ -542,7 +542,7 @@ void StatisticsParticipantImpl::on_entity_discovery( { using namespace fastrtps; - if (!are_statistics_writers_enabled(EventKindBits::DISCOVERED_ENTITY)) + if (!are_statistics_writers_enabled(EventKind::DISCOVERED_ENTITY)) { return; } @@ -601,7 +601,7 @@ void StatisticsParticipantImpl::on_entity_discovery( void StatisticsParticipantImpl::on_pdp_packet( const uint32_t packages) { - if (!are_statistics_writers_enabled(EventKindBits::PDP_PACKETS)) + if (!are_statistics_writers_enabled(EventKind::PDP_PACKETS)) { return; } @@ -619,7 +619,7 @@ void StatisticsParticipantImpl::on_pdp_packet( Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(notification); - data._d(EventKindBits::PDP_PACKETS); + data._d(EventKind::PDP_PACKETS); for_each_listener([&data](const std::shared_ptr& listener) { @@ -630,7 +630,7 @@ void StatisticsParticipantImpl::on_pdp_packet( void StatisticsParticipantImpl::on_edp_packet( const uint32_t packages) { - if (!are_statistics_writers_enabled(EventKindBits::EDP_PACKETS)) + if (!are_statistics_writers_enabled(EventKind::EDP_PACKETS)) { return; } @@ -648,7 +648,7 @@ void StatisticsParticipantImpl::on_edp_packet( Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(notification); - data._d(EventKindBits::EDP_PACKETS); + data._d(EventKind::EDP_PACKETS); for_each_listener([&data](const std::shared_ptr& listener) { diff --git a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp index 721974dbc9c..f8565957923 100644 --- a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp +++ b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp @@ -65,7 +65,7 @@ void StatisticsReaderImpl::on_data_notify( const fastrtps::rtps::GUID_t& writer_guid, const fastrtps::rtps::Time_t& source_timestamp) { - if (!are_statistics_writers_enabled(EventKindBits::HISTORY2HISTORY_LATENCY)) + if (!are_statistics_writers_enabled(EventKind::HISTORY2HISTORY_LATENCY)) { return; } @@ -96,7 +96,7 @@ void StatisticsReaderImpl::on_data_notify( void StatisticsReaderImpl::on_acknack( int32_t count) { - if (!are_statistics_writers_enabled(EventKindBits::ACKNACK_COUNT)) + if (!are_statistics_writers_enabled(EventKind::ACKNACK_COUNT)) { return; } @@ -109,7 +109,7 @@ void StatisticsReaderImpl::on_acknack( Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(notification); - data._d(EventKindBits::ACKNACK_COUNT); + data._d(EventKind::ACKNACK_COUNT); for_each_listener([&data](const std::shared_ptr& listener) { @@ -120,7 +120,7 @@ void StatisticsReaderImpl::on_acknack( void StatisticsReaderImpl::on_nackfrag( int32_t count) { - if (!are_statistics_writers_enabled(EventKindBits::NACKFRAG_COUNT)) + if (!are_statistics_writers_enabled(EventKind::NACKFRAG_COUNT)) { return; } @@ -133,7 +133,7 @@ void StatisticsReaderImpl::on_nackfrag( Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(notification); - data._d(EventKindBits::NACKFRAG_COUNT); + data._d(EventKind::NACKFRAG_COUNT); for_each_listener([&data](const std::shared_ptr& listener) { @@ -149,7 +149,7 @@ void StatisticsReaderImpl::on_subscribe_throughput( if (payload > 0 ) { - if (!are_statistics_writers_enabled(EventKindBits::SUBSCRIPTION_THROUGHPUT)) + if (!are_statistics_writers_enabled(EventKind::SUBSCRIPTION_THROUGHPUT)) { return; } @@ -170,7 +170,7 @@ void StatisticsReaderImpl::on_subscribe_throughput( Data data; // note that the setter sets PUBLICATION_THROUGHPUT by default data.entity_data(std::move(notification)); - data._d(EventKindBits::SUBSCRIPTION_THROUGHPUT); + data._d(EventKind::SUBSCRIPTION_THROUGHPUT); for_each_listener([&data](const std::shared_ptr& listener) { diff --git a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp index 1e289668ac1..ee811525310 100644 --- a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp +++ b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp @@ -67,7 +67,7 @@ void StatisticsWriterImpl::on_sample_datas( const fastrtps::rtps::SampleIdentity& sample_identity, size_t num_sent_submessages) { - if (!are_statistics_writers_enabled(EventKindBits::SAMPLE_DATAS)) + if (!are_statistics_writers_enabled(EventKind::SAMPLE_DATAS)) { return; } @@ -97,7 +97,7 @@ void StatisticsWriterImpl::on_data_generated( void StatisticsWriterImpl::on_data_sent() { - if (!are_statistics_writers_enabled(EventKindBits::DATA_COUNT)) + if (!are_statistics_writers_enabled(EventKind::DATA_COUNT)) { return; } @@ -115,7 +115,7 @@ void StatisticsWriterImpl::on_data_sent() Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(std::move(notification)); - data._d(EventKindBits::DATA_COUNT); + data._d(EventKind::DATA_COUNT); for_each_listener([&data](const std::shared_ptr& listener) { @@ -126,7 +126,7 @@ void StatisticsWriterImpl::on_data_sent() void StatisticsWriterImpl::on_heartbeat( uint32_t count) { - if (!are_statistics_writers_enabled(EventKindBits::HEARTBEAT_COUNT)) + if (!are_statistics_writers_enabled(EventKind::HEARTBEAT_COUNT)) { return; } @@ -139,7 +139,7 @@ void StatisticsWriterImpl::on_heartbeat( Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(std::move(notification)); - data._d(EventKindBits::HEARTBEAT_COUNT); + data._d(EventKind::HEARTBEAT_COUNT); for_each_listener([&data](const std::shared_ptr& listener) { @@ -149,7 +149,7 @@ void StatisticsWriterImpl::on_heartbeat( void StatisticsWriterImpl::on_gap() { - if (!are_statistics_writers_enabled(EventKindBits::GAP_COUNT)) + if (!are_statistics_writers_enabled(EventKind::GAP_COUNT)) { return; } @@ -166,7 +166,7 @@ void StatisticsWriterImpl::on_gap() Data data; // note that the setter sets RESENT_DATAS by default data.entity_count(std::move(notification)); - data._d(EventKindBits::GAP_COUNT); + data._d(EventKind::GAP_COUNT); for_each_listener([&data](const std::shared_ptr& listener) { @@ -182,7 +182,7 @@ void StatisticsWriterImpl::on_resent_data( return; } - if (!are_statistics_writers_enabled(EventKindBits::RESENT_DATAS)) + if (!are_statistics_writers_enabled(EventKind::RESENT_DATAS)) { return; } @@ -214,7 +214,7 @@ void StatisticsWriterImpl::on_publish_throughput( if (payload > 0 ) { - if (!are_statistics_writers_enabled(EventKindBits::PUBLICATION_THROUGHPUT)) + if (!are_statistics_writers_enabled(EventKind::PUBLICATION_THROUGHPUT)) { return; } diff --git a/test/unittest/statistics/dds/DomainParticipantStatisticsListenerTests.cpp b/test/unittest/statistics/dds/DomainParticipantStatisticsListenerTests.cpp index 553ab7d2b98..f5ba6b07242 100644 --- a/test/unittest/statistics/dds/DomainParticipantStatisticsListenerTests.cpp +++ b/test/unittest/statistics/dds/DomainParticipantStatisticsListenerTests.cpp @@ -134,7 +134,7 @@ class DomainParticipantStatisticsListenerTests : public ::testing::Test } void write_all_data_except( - EventKind kind) + uint32_t kind) { for (const Data& data : data_) { @@ -156,25 +156,25 @@ class DomainParticipantStatisticsListenerTests : public ::testing::Test std::array, 17> writers_; std::array data_to_check_; std::array data_; - std::array kinds_ = + std::array kinds_ = { - EventKindBits::HISTORY2HISTORY_LATENCY, - EventKindBits::NETWORK_LATENCY, - EventKindBits::PUBLICATION_THROUGHPUT, - EventKindBits::SUBSCRIPTION_THROUGHPUT, - EventKindBits::RTPS_SENT, - EventKindBits::RTPS_LOST, - EventKindBits::RESENT_DATAS, - EventKindBits::HEARTBEAT_COUNT, - EventKindBits::ACKNACK_COUNT, - EventKindBits::NACKFRAG_COUNT, - EventKindBits::GAP_COUNT, - EventKindBits::DATA_COUNT, - EventKindBits::PDP_PACKETS, - EventKindBits::EDP_PACKETS, - EventKindBits::DISCOVERED_ENTITY, - EventKindBits::SAMPLE_DATAS, - EventKindBits::PHYSICAL_DATA + EventKind::HISTORY2HISTORY_LATENCY, + EventKind::NETWORK_LATENCY, + EventKind::PUBLICATION_THROUGHPUT, + EventKind::SUBSCRIPTION_THROUGHPUT, + EventKind::RTPS_SENT, + EventKind::RTPS_LOST, + EventKind::RESENT_DATAS, + EventKind::HEARTBEAT_COUNT, + EventKind::ACKNACK_COUNT, + EventKind::NACKFRAG_COUNT, + EventKind::GAP_COUNT, + EventKind::DATA_COUNT, + EventKind::PDP_PACKETS, + EventKind::EDP_PACKETS, + EventKind::DISCOVERED_ENTITY, + EventKind::SAMPLE_DATAS, + EventKind::PHYSICAL_DATA }; DomainParticipantStatisticsListener listener_; diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp index 6c4e06e3dbb..c272890046a 100644 --- a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp +++ b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp @@ -85,52 +85,52 @@ struct MockListener : IListener auto kind = data._d(); switch (kind) { - case HISTORY2HISTORY_LATENCY: + case EventKind::HISTORY2HISTORY_LATENCY: on_history_latency(data.writer_reader_data()); break; - case RTPS_SENT: + case EventKind::RTPS_SENT: on_rtps_sent(data.entity2locator_traffic()); break; - case RTPS_LOST: + case EventKind::RTPS_LOST: on_rtps_lost(data.entity2locator_traffic()); break; - case NETWORK_LATENCY: + case EventKind::NETWORK_LATENCY: on_network_latency(data.locator2locator_data()); break; - case HEARTBEAT_COUNT: + case EventKind::HEARTBEAT_COUNT: on_heartbeat_count(data.entity_count()); break; - case ACKNACK_COUNT: + case EventKind::ACKNACK_COUNT: on_acknack_count(data.entity_count()); break; - case DATA_COUNT: + case EventKind::DATA_COUNT: on_data_count(data.entity_count()); break; - case RESENT_DATAS: + case EventKind::RESENT_DATAS: on_resent_count(data.entity_count()); break; - case GAP_COUNT: + case EventKind::GAP_COUNT: on_gap_count(data.entity_count()); break; - case NACKFRAG_COUNT: + case EventKind::NACKFRAG_COUNT: on_nackfrag_count(data.entity_count()); break; - case DISCOVERED_ENTITY: + case EventKind::DISCOVERED_ENTITY: on_entity_discovery(data.discovery_time()); break; - case PDP_PACKETS: + case EventKind::PDP_PACKETS: on_pdp_packets(data.entity_count()); break; - case EDP_PACKETS: + case EventKind::EDP_PACKETS: on_edp_packets(data.entity_count()); break; - case SAMPLE_DATAS: + case EventKind::SAMPLE_DATAS: on_sample_datas(data.sample_identity_count()); break; - case PUBLICATION_THROUGHPUT: + case EventKind::PUBLICATION_THROUGHPUT: on_publisher_throughput(data.entity_data()); break; - case SUBSCRIPTION_THROUGHPUT: + case EventKind::SUBSCRIPTION_THROUGHPUT: on_subscriber_throughput(data.entity_data()); break; default: @@ -155,7 +155,7 @@ struct MockListener : IListener MOCK_METHOD1(on_sample_datas, void(const eprosima::fastdds::statistics::SampleIdentityCount&)); MOCK_METHOD1(on_publisher_throughput, void(const eprosima::fastdds::statistics::EntityData&)); MOCK_METHOD1(on_subscriber_throughput, void(const eprosima::fastdds::statistics::EntityData&)); - MOCK_METHOD1(on_unexpected_kind, void(eprosima::fastdds::statistics::EventKind)); + MOCK_METHOD1(on_unexpected_kind, void(uint32_t)); }; class RTPSStatisticsTestsImpl @@ -500,9 +500,9 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_management) auto nolistener = listener1; nolistener.reset(); - EventKind kind = EventKindBits::PUBLICATION_THROUGHPUT; - EventKind another_kind = EventKindBits::SUBSCRIPTION_THROUGHPUT; - EventKind yet_another_kind = EventKindBits::NETWORK_LATENCY; + uint32_t kind = EventKind::PUBLICATION_THROUGHPUT; + uint32_t another_kind = EventKind::SUBSCRIPTION_THROUGHPUT; + uint32_t yet_another_kind = EventKind::NETWORK_LATENCY; // test the participant apis // + fails to remove an empty listener @@ -632,13 +632,13 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) // participant specific callbacks auto participant_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, - EventKindBits::RTPS_SENT | EventKindBits::NETWORK_LATENCY | EventKindBits::RTPS_LOST)); + EventKind::RTPS_SENT | EventKind::NETWORK_LATENCY | EventKind::RTPS_LOST)); // writer callbacks through participant listener auto participant_writer_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_writer_listener, - EventKindBits::DATA_COUNT | EventKindBits::RESENT_DATAS | - EventKindBits::PUBLICATION_THROUGHPUT | EventKindBits::SAMPLE_DATAS)); + EventKind::DATA_COUNT | EventKind::RESENT_DATAS | + EventKind::PUBLICATION_THROUGHPUT | EventKind::SAMPLE_DATAS)); // writer specific callbacks auto writer_listener = make_shared(); @@ -647,8 +647,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) // reader callbacks through participant listener auto participant_reader_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_reader_listener, - EventKindBits::ACKNACK_COUNT | EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::SUBSCRIPTION_THROUGHPUT)); + EventKind::ACKNACK_COUNT | EventKind::HISTORY2HISTORY_LATENCY | + EventKind::SUBSCRIPTION_THROUGHPUT)); // reader specific callbacks auto reader_listener = make_shared(); @@ -723,28 +723,28 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) EXPECT_TRUE(reader_->remove_statistics_listener(reader_listener)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, - EventKindBits::RTPS_SENT | EventKindBits::NETWORK_LATENCY | EventKindBits::RTPS_LOST)); + EventKind::RTPS_SENT | EventKind::NETWORK_LATENCY | EventKind::RTPS_LOST)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_writer_listener, - EventKindBits::DATA_COUNT | EventKindBits::RESENT_DATAS | - EventKindBits::PUBLICATION_THROUGHPUT | EventKindBits::SAMPLE_DATAS)); + EventKind::DATA_COUNT | EventKind::RESENT_DATAS | + EventKind::PUBLICATION_THROUGHPUT | EventKind::SAMPLE_DATAS)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_reader_listener, - EventKindBits::ACKNACK_COUNT | EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::SUBSCRIPTION_THROUGHPUT)); + EventKind::ACKNACK_COUNT | EventKind::HISTORY2HISTORY_LATENCY | + EventKind::SUBSCRIPTION_THROUGHPUT)); }; // Check that setting the mask after creating the endpoints work uint32_t enable_writers_mask = - EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::NETWORK_LATENCY | - EventKindBits::PUBLICATION_THROUGHPUT | - EventKindBits::SUBSCRIPTION_THROUGHPUT | - EventKindBits::RTPS_SENT | - EventKindBits::RTPS_LOST | - EventKindBits::RESENT_DATAS | - EventKindBits::HEARTBEAT_COUNT | - EventKindBits::ACKNACK_COUNT | - EventKindBits::DATA_COUNT | - EventKindBits::SAMPLE_DATAS; + EventKind::HISTORY2HISTORY_LATENCY | + EventKind::NETWORK_LATENCY | + EventKind::PUBLICATION_THROUGHPUT | + EventKind::SUBSCRIPTION_THROUGHPUT | + EventKind::RTPS_SENT | + EventKind::RTPS_LOST | + EventKind::RESENT_DATAS | + EventKind::HEARTBEAT_COUNT | + EventKind::ACKNACK_COUNT | + EventKind::DATA_COUNT | + EventKind::SAMPLE_DATAS; create_endpoints(length, RELIABLE); participant_->set_enabled_statistics_writers_mask(enable_writers_mask); test_execution(); @@ -800,16 +800,16 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented) }); uint32_t enable_writers_mask = - EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::HEARTBEAT_COUNT | - EventKindBits::ACKNACK_COUNT | - EventKindBits::NACKFRAG_COUNT | - EventKindBits::DATA_COUNT; + EventKind::HISTORY2HISTORY_LATENCY | + EventKind::HEARTBEAT_COUNT | + EventKind::ACKNACK_COUNT | + EventKind::NACKFRAG_COUNT | + EventKind::DATA_COUNT; // writer callbacks through participant listener auto participant_listener = make_shared(); - uint32_t mask = EventKindBits::DATA_COUNT | EventKindBits::HEARTBEAT_COUNT - | EventKindBits::ACKNACK_COUNT | EventKindBits::NACKFRAG_COUNT | EventKindBits::HISTORY2HISTORY_LATENCY; + uint32_t mask = EventKind::DATA_COUNT | EventKind::HEARTBEAT_COUNT + | EventKind::ACKNACK_COUNT | EventKind::NACKFRAG_COUNT | EventKind::HISTORY2HISTORY_LATENCY; ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, mask)); participant_->set_enabled_statistics_writers_mask(enable_writers_mask); @@ -910,13 +910,13 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_no_enabled_writer // participant specific callbacks auto participant_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, - EventKindBits::RTPS_SENT | EventKindBits::NETWORK_LATENCY | EventKindBits::RTPS_LOST)); + EventKind::RTPS_SENT | EventKind::NETWORK_LATENCY | EventKind::RTPS_LOST)); // writer callbacks through participant listener auto participant_writer_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_writer_listener, - EventKindBits::DATA_COUNT | EventKindBits::RESENT_DATAS | - EventKindBits::PUBLICATION_THROUGHPUT | EventKindBits::SAMPLE_DATAS)); + EventKind::DATA_COUNT | EventKind::RESENT_DATAS | + EventKind::PUBLICATION_THROUGHPUT | EventKind::SAMPLE_DATAS)); // writer specific callbacks auto writer_listener = make_shared(); @@ -925,8 +925,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_no_enabled_writer // reader callbacks through participant listener auto participant_reader_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_reader_listener, - EventKindBits::ACKNACK_COUNT | EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::SUBSCRIPTION_THROUGHPUT)); + EventKind::ACKNACK_COUNT | EventKind::HISTORY2HISTORY_LATENCY | + EventKind::SUBSCRIPTION_THROUGHPUT)); // reader specific callbacks auto reader_listener = make_shared(); @@ -1001,13 +1001,13 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_no_enabled_writer EXPECT_TRUE(reader_->remove_statistics_listener(reader_listener)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, - EventKindBits::RTPS_SENT | EventKindBits::NETWORK_LATENCY | EventKindBits::RTPS_LOST)); + EventKind::RTPS_SENT | EventKind::NETWORK_LATENCY | EventKind::RTPS_LOST)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_writer_listener, - EventKindBits::DATA_COUNT | EventKindBits::RESENT_DATAS | - EventKindBits::PUBLICATION_THROUGHPUT | EventKindBits::SAMPLE_DATAS)); + EventKind::DATA_COUNT | EventKind::RESENT_DATAS | + EventKind::PUBLICATION_THROUGHPUT | EventKind::SAMPLE_DATAS)); EXPECT_TRUE(participant_->remove_statistics_listener(participant_reader_listener, - EventKindBits::ACKNACK_COUNT | EventKindBits::HISTORY2HISTORY_LATENCY | - EventKindBits::SUBSCRIPTION_THROUGHPUT)); + EventKind::ACKNACK_COUNT | EventKind::HISTORY2HISTORY_LATENCY | + EventKind::SUBSCRIPTION_THROUGHPUT)); } /* @@ -1021,14 +1021,14 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_gap_callback) using namespace std; uint32_t enable_writers_mask = - EventKindBits::PUBLICATION_THROUGHPUT | - EventKindBits::RESENT_DATAS | - EventKindBits::HEARTBEAT_COUNT | - EventKindBits::ACKNACK_COUNT | - EventKindBits::NACKFRAG_COUNT | - EventKindBits::GAP_COUNT | - EventKindBits::DATA_COUNT | - EventKindBits::SAMPLE_DATAS; + EventKind::PUBLICATION_THROUGHPUT | + EventKind::RESENT_DATAS | + EventKind::HEARTBEAT_COUNT | + EventKind::ACKNACK_COUNT | + EventKind::NACKFRAG_COUNT | + EventKind::GAP_COUNT | + EventKind::DATA_COUNT | + EventKind::SAMPLE_DATAS; // create the listeners and set expectations auto participant_writer_listener = make_shared(); @@ -1057,7 +1057,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_gap_callback) writer_->set_enabled_statistics_writers_mask(enable_writers_mask); // writer callback through participant listener - ASSERT_TRUE(participant_->add_statistics_listener(participant_writer_listener, EventKindBits::GAP_COUNT)); + ASSERT_TRUE(participant_->add_statistics_listener(participant_writer_listener, EventKind::GAP_COUNT)); // writer specific callbacks ASSERT_TRUE(writer_->add_statistics_listener(writer_listener)); @@ -1088,7 +1088,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_gap_callback) // release the listeners EXPECT_TRUE(writer_->remove_statistics_listener(writer_listener)); - EXPECT_TRUE(participant_->remove_statistics_listener(participant_writer_listener, EventKindBits::GAP_COUNT)); + EXPECT_TRUE(participant_->remove_statistics_listener(participant_writer_listener, EventKind::GAP_COUNT)); } /* @@ -1102,14 +1102,14 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_discovery_callbacks) using namespace std; uint32_t enable_writers_mask = - EventKindBits::PDP_PACKETS | - EventKindBits::EDP_PACKETS | - EventKindBits::DISCOVERED_ENTITY; + EventKind::PDP_PACKETS | + EventKind::EDP_PACKETS | + EventKind::DISCOVERED_ENTITY; // create the listener and set expectations auto participant_listener = make_shared(); ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, - EventKindBits::DISCOVERED_ENTITY | EventKindBits::PDP_PACKETS | EventKindBits::EDP_PACKETS)); + EventKind::DISCOVERED_ENTITY | EventKind::PDP_PACKETS | EventKind::EDP_PACKETS)); participant_->set_enabled_statistics_writers_mask(enable_writers_mask); // check callbacks on data exchange @@ -1154,7 +1154,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_discovery_callbacks) } // release the listener - EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, EventKindBits::DISCOVERED_ENTITY)); + EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, EventKind::DISCOVERED_ENTITY)); } /* @@ -1238,11 +1238,11 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_avoid_empty_resent_callbacks) uint16_t length = 255; create_lazy_writer(length, RELIABLE, TRANSIENT_LOCAL); uint32_t enable_writers_mask = - EventKindBits::HEARTBEAT_COUNT | - EventKindBits::DATA_COUNT | - EventKindBits::SAMPLE_DATAS | - EventKindBits::PUBLICATION_THROUGHPUT | - EventKindBits::RESENT_DATAS; + EventKind::HEARTBEAT_COUNT | + EventKind::DATA_COUNT | + EventKind::SAMPLE_DATAS | + EventKind::PUBLICATION_THROUGHPUT | + EventKind::RESENT_DATAS; writer_->set_enabled_statistics_writers_mask(enable_writers_mask); // writer specific callbacks @@ -1345,8 +1345,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_unordered_datagrams) // create the listener and set expectations auto participant_listener = make_shared(); - ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, EventKindBits::RTPS_LOST)); - participant_->set_enabled_statistics_writers_mask(EventKindBits::RTPS_LOST); + ASSERT_TRUE(participant_->add_statistics_listener(participant_listener, EventKind::RTPS_LOST)); + participant_->set_enabled_statistics_writers_mask(EventKind::RTPS_LOST); std::vector lost_callback_data; auto callback_action = [&lost_callback_data](const Entity2LocatorTraffic& data) -> void @@ -1383,7 +1383,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_unordered_datagrams) std::this_thread::sleep_for(std::chrono::seconds(1)); // release the listener - EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, EventKindBits::RTPS_LOST)); + EXPECT_TRUE(participant_->remove_statistics_listener(participant_listener, EventKind::RTPS_LOST)); // Check reported callbacks EXPECT_EQ(sizeof(lost_count_notified) / sizeof(lost_count_notified[0]), lost_callback_data.size());