Refactor Statistics module IDL (#4638)

* Refs #20714: refactor statistics module IDL Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20714: regenerate types Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20714: correctly use new statistics IDL Signed-off-by: JLBuenoLopez-eProsima <[email protected]> --------- Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
eProsima · Apr 3, 2024 · f3b3af6 · f3b3af6
1 parent 20f1a99
commit f3b3af6
Show file tree

Hide file tree

Showing 59 changed files with 4,257 additions and 3,933 deletions.
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfiguration.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git 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 <array>
 #include <bitset>
 #include <cstdint>
@@ -34,6 +35,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #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
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git 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
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/Filtering/FilteringExample.h b/examples/cpp/dds/Filtering/FilteringExample.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.h b/examples/cpp/dds/FlowControlExample/FlowControlExample.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorld.h b/examples/cpp/dds/HelloWorldExample/HelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h
@@ -35,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #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
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrength.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/RequestReplyExample/Calculator.h b/examples/cpp/dds/RequestReplyExample/Calculator.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 

diff --git 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/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;
 };
 

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -79,44 +79,44 @@ 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(
         const std::string& topic_name,
         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
@@ -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.