Refs #21295: Change signature of fill_discovery_data_from_cdr_message

Signed-off-by: elianalf <[email protected]>
eProsima · Jul 17, 2024 · 6bfa982 · 6bfa982
1 parent 49278c4
commit 6bfa982
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 20 deletions.
diff --git a/include/fastdds/rtps/participant/RTPSParticipant.hpp b/include/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -27,6 +27,7 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
+#include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -396,15 +397,15 @@ class FASTDDS_EXPORTED_API RTPSParticipant
     bool disable_monitor_service() const;
 
     /**
-     * fills in the ParticipantProxyData from a MonitorService Message
+     * fills in the ParticipantBuiltinTopicData from a MonitorService Message
      *
      * @param [out] data Proxy to fill
      * @param [in] msg MonitorService Message to get the proxy information from.
      *
      * @return true if the operation succeeds.
      */
     bool fill_discovery_data_from_cdr_message(
-            ParticipantProxyData& data,
+            ParticipantBuiltinTopicData& data,
             fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**

diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
@@ -136,7 +136,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
     FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t disable_monitor_service();
 
     /**
-     * fills in the ParticipantProxyData from a MonitorService Message
+     * fills in the ParticipantBuiltinTopicData from a MonitorService Message
      *
      * @param [out] data Proxy to fill
      * @param [in] msg MonitorService Message to get the proxy information from.
@@ -145,7 +145,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
      * @return RETCODE_ERROR if the  operation fails.
      */
     FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastdds::rtps::ParticipantProxyData& data,
+            fastdds::rtps::ParticipantBuiltinTopicData& data,
             statistics::MonitorServiceStatusData& msg);
 
     /**
@@ -162,7 +162,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
             statistics::MonitorServiceStatusData& msg);
 
     /**
-     * fills in the ParticipantProxyData from a MonitorService Message
+     * fills in the ParticipantBuiltinTopicData from a MonitorService Message
      *
      * @param [out] data Proxy to fill
      * @param [in] msg MonitorService Message to get the proxy information from.
@@ -171,7 +171,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
      * @return RETCODE_ERROR if the  operation fails.
      */
     FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastdds::rtps::ParticipantProxyData& data,
+            fastdds::rtps::ParticipantBuiltinTopicData& data,
             const statistics::MonitorServiceStatusData& msg);
 
     /**

diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp
@@ -261,7 +261,7 @@ bool RTPSParticipant::disable_monitor_service() const
 }
 
 bool RTPSParticipant::fill_discovery_data_from_cdr_message(
-        ParticipantProxyData& data,
+        ParticipantBuiltinTopicData& data,
         fastdds::statistics::MonitorServiceStatusData& msg)
 {
     return mp_impl->fill_discovery_data_from_cdr_message(data, msg);

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -2931,7 +2931,7 @@ bool RTPSParticipantImpl::disable_monitor_service() const
 }
 
 bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message(
-        fastdds::rtps::ParticipantProxyData& data,
+        fastdds::rtps::ParticipantBuiltinTopicData& data,
         fastdds::statistics::MonitorServiceStatusData& msg)
 {
     bool ret = true;
@@ -2941,15 +2941,23 @@ bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message(
     serialized_msg.buffer = msg.value().entity_proxy().data();
     serialized_msg.length = static_cast<uint32_t>(msg.value().entity_proxy().size());
 
-    ret = data.readFromCDRMessage(
+    ParticipantProxyData part_prox_data(m_att.allocation);
+
+
+    ret = part_prox_data.readFromCDRMessage(
         &serialized_msg,
         true,
         network_factory(),
         has_shm_transport(),
         false,
         c_VendorId_eProsima);
 
-    return ret && (data.m_guid.entityId == c_EntityId_RTPSParticipant);
+    if (ret)
+    {
+        from_proxy_to_builtin(part_prox_data, data);
+    }
+
+    return ret && (data.guid.entityId == c_EntityId_RTPSParticipant);
 }
 
 bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message(

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -39,6 +39,7 @@
 
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
+#include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
@@ -1218,15 +1219,15 @@ class RTPSParticipantImpl
     bool disable_monitor_service() const;
 
     /**
-     * fills in the ParticipantProxyData from a MonitorService Message
+     * fills in the ParticipantBuiltinTopicData from a MonitorService Message
      *
      * @param [out] data Proxy to fill
      * @param [in] msg MonitorService Message to get the proxy information from.
      *
      * @return true if the operation succeeds.
      */
     bool fill_discovery_data_from_cdr_message(
-            ParticipantProxyData& data,
+            ParticipantBuiltinTopicData& data,
             fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp
@@ -113,7 +113,7 @@ fastdds::dds::ReturnCode_t DomainParticipant::disable_monitor_service()
 }
 
 fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message(
-        fastdds::rtps::ParticipantProxyData& data,
+        fastdds::rtps::ParticipantBuiltinTopicData& data,
         fastdds::statistics::MonitorServiceStatusData& msg)
 {
 #ifdef FASTDDS_STATISTICS

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -323,7 +323,7 @@ ReturnCode_t DomainParticipantImpl::disable_monitor_service()
 }
 
 ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message(
-        fastdds::rtps::ParticipantProxyData& data,
+        fastdds::rtps::ParticipantBuiltinTopicData& data,
         fastdds::statistics::MonitorServiceStatusData& msg)
 {
     ReturnCode_t ret{efd::RETCODE_OK};

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
@@ -146,7 +146,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl,
     efd::ReturnCode_t disable_monitor_service();
 
     /**
-     * fills in the ParticipantProxyData from a MonitorService Message
+     * fills in the ParticipantBuiltinTopicData from a MonitorService Message
      *
      * @param [out] data Proxy to fill
      * @param [in] msg MonitorService Message to get the proxy information from.
@@ -155,7 +155,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl,
      * @return RETCODE_ERROR if the  operation fails.
      */
     efd::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastdds::rtps::ParticipantProxyData& data,
+            fastdds::rtps::ParticipantBuiltinTopicData& data,
             fastdds::statistics::MonitorServiceStatusData& msg);
 
     /**

diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
@@ -703,16 +703,15 @@ struct ProxySampleValidator : public SampleValidator
 
                 if (guid.entityId == c_EntityId_RTPSParticipant)
                 {
-                    RTPSParticipantAllocationAttributes att;
-                    eprosima::fastdds::rtps::ParticipantProxyData pdata(att);
+                    eprosima::fastdds::rtps::ParticipantBuiltinTopicData pdata;
 
                     ASSERT_EQ(participant->fill_discovery_data_from_cdr_message(pdata,
                             data),
                             eprosima::fastdds::dds::RETCODE_OK);
 
                     auto part_names = participant->get_participant_names();
                     auto it_names =
-                            std::find(part_names.begin(), part_names.end(), pdata.m_participantName.to_string());
+                            std::find(part_names.begin(), part_names.end(), pdata.participant_name.to_string());
                     ASSERT_TRUE(it_names != part_names.end());
                 }
                 else if (guid.entityId.is_reader())

diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -29,6 +29,7 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 
 #include <rtps/builtin/data/ParticipantProxyData.hpp>
@@ -126,7 +127,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant
     }
 
     bool fill_discovery_data_from_cdr_message(
-            fastdds::rtps::ParticipantProxyData& /*data*/,
+            fastdds::rtps::ParticipantBuiltinTopicData& /*data*/,
             fastdds::statistics::MonitorServiceStatusData& /*msg*/)
     {
         return true;