Fix profiling allocations test build (#4843)

* Refs #21081: Make Alloc Tests compatible with 3.x Signed-off-by: cferreiragonz <[email protected]> * Refs #21081: Use a separate listener in pub/sub Signed-off-by: cferreiragonz <[email protected]> * Refs #21081: Disable Data_sharing Signed-off-by: cferreiragonz <[email protected]> * Revert "Refs #21081: Use a separate listener in pub/sub" This reverts commit ac21b65. Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]>
eProsima · May 31, 2024 · 2b7c0f6 · 2b7c0f6
1 parent 863b990
commit 2b7c0f6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/test/profiling/allocations/AllocTestPublisher.cpp b/test/profiling/allocations/AllocTestPublisher.cpp
@@ -27,21 +27,20 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
-#include <fastrtps/types/TypesBase.h>
 
 #include "AllocTestCommon.h"
 #include "AllocTestTypePubSubTypes.h"
 
 using namespace eprosima::fastdds::dds;
 
 #define CHECK_RETURN_CODE(ret) \
-    if (ReturnCode_t::RETCODE_OK != ret) \
+    if (RETCODE_OK != ret) \
     { \
         return false; \
     }
 
 #define CHECK_ENTITY_CREATION(entity) \
-    if (nullptr != entity) \
+    if (nullptr == entity) \
     { \
         return false; \
     }
@@ -78,7 +77,7 @@ bool AllocTestPublisher::init(
     profile_ = profile;
     output_file_ = output_file;
 
-    ReturnCode_t ret = ReturnCode_t::RETCODE_OK;
+    ReturnCode_t ret = RETCODE_OK;
 
     std::shared_ptr<DomainParticipantFactory> factory = DomainParticipantFactory::get_shared_instance();
     ret = factory->load_XML_profiles_file("test_xml_profile.xml");
@@ -106,7 +105,7 @@ bool AllocTestPublisher::init(
 
     bool show_allocation_traces = std::getenv("FASTDDS_PROFILING_PRINT_TRACES") != nullptr;
     eprosima_profiling::entities_created(show_allocation_traces);
-    return ret == ReturnCode_t::RETCODE_OK;
+    return ret == RETCODE_OK;
 }
 
 void AllocTestPublisher::on_publication_matched(

diff --git a/test/profiling/allocations/AllocTestPublisher.hpp b/test/profiling/allocations/AllocTestPublisher.hpp
@@ -34,7 +34,7 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include "AllocTestType.h"
+#include "AllocTestType.hpp"
 
 class AllocTestPublisher : public eprosima::fastdds::dds::DataWriterListener
 {

diff --git a/test/profiling/allocations/AllocTestSubscriber.cpp b/test/profiling/allocations/AllocTestSubscriber.cpp
@@ -33,21 +33,20 @@
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
-#include <fastrtps/types/TypesBase.h>
 
 #include "AllocTestCommon.h"
 #include "AllocTestTypePubSubTypes.h"
 
 using namespace eprosima::fastdds::dds;
 
 #define CHECK_RETURN_CODE(ret) \
-    if (ReturnCode_t::RETCODE_OK != ret) \
+    if (RETCODE_OK != ret) \
     { \
         return false; \
     }
 
 #define CHECK_ENTITY_CREATION(entity) \
-    if (nullptr != entity) \
+    if (nullptr == entity) \
     { \
         return false; \
     }
@@ -83,7 +82,7 @@ bool AllocTestSubscriber::init(
     profile_ = profile;
     output_file_ = output_file;
 
-    ReturnCode_t ret = ReturnCode_t::RETCODE_OK;
+    ReturnCode_t ret = RETCODE_OK;
 
     std::shared_ptr<DomainParticipantFactory> factory = DomainParticipantFactory::get_shared_instance();
     ret = factory->load_XML_profiles_file("test_xml_profile.xml");
@@ -111,7 +110,7 @@ bool AllocTestSubscriber::init(
 
     bool show_allocation_traces = std::getenv("FASTDDS_PROFILING_PRINT_TRACES") != nullptr;
     eprosima_profiling::entities_created(show_allocation_traces);
-    return ret == ReturnCode_t::RETCODE_OK;
+    return ret == RETCODE_OK;
 }
 
 void AllocTestSubscriber::on_subscription_matched(
@@ -140,7 +139,7 @@ void AllocTestSubscriber::on_data_available(
         DataReader* reader)
 {
     SampleInfo info;
-    if (ReturnCode_t::RETCODE_OK == reader->take_next_sample(&data_, &info))
+    if (RETCODE_OK == reader->take_next_sample(&data_, &info))
     {
         if ((info.instance_state == ALIVE_INSTANCE_STATE) && (info.valid_data) &&
                 (reader->is_sample_valid(&data_, &info)))

diff --git a/test/profiling/allocations/AllocTestSubscriber.hpp b/test/profiling/allocations/AllocTestSubscriber.hpp
@@ -34,7 +34,7 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include "AllocTestType.h"
+#include "AllocTestType.hpp"
 
 class AllocTestSubscriber : public eprosima::fastdds::dds::DataReaderListener
 {

diff --git a/test/profiling/allocations/test_xml_profile.xml b/test/profiling/allocations/test_xml_profile.xml
@@ -69,6 +69,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>TRANSIENT_LOCAL</kind>
                 </durability>
@@ -96,6 +99,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>TRANSIENT_LOCAL</kind>
                 </durability>
@@ -123,6 +129,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>VOLATILE</kind>
                 </durability>
@@ -150,6 +159,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>VOLATILE</kind>
                 </durability>
@@ -179,6 +191,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>TRANSIENT_LOCAL</kind>
                 </durability>
@@ -206,6 +221,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>TRANSIENT_LOCAL</kind>
                 </durability>
@@ -233,6 +251,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>VOLATILE</kind>
                 </durability>
@@ -260,6 +281,9 @@
                 </resourceLimitsQos>
             </topic>
             <qos>
+                <data_sharing>
+                    <kind>OFF</kind>
+                </data_sharing>
                 <durability>
                     <kind>VOLATILE</kind>
                 </durability>