Refs #21096: Extend test transport configuration

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Jun 3, 2024 · b690e65 · b690e65
1 parent b002c1d
commit b690e65
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
@@ -47,8 +47,16 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor
     //! Test shim parameters
     //! Percentage of data messages being dropped
     mutable std::atomic<uint8_t> dropDataMessagesPercentage;
+    //! Percentage of Data[P] messages being dropped
+    mutable std::atomic<uint8_t> dropParticipantBuiltinDataMessagesPercentage;
+    //! Percentage of Data[W] messages being dropped
+    mutable std::atomic<uint8_t> dropPublicationBuiltinDataMessagesPercentage;
+    //! Percentage of Data[R] messages being dropped
+    mutable std::atomic<uint8_t> dropSubscriptionBuiltinDataMessagesPercentage;
     //! Filtering function for dropping data messages
     filter drop_data_messages_filter_;
+    //! Filtering function for dropping builtin data messages
+    filter drop_builtin_data_messages_filter_;
     //! Flag to enable dropping of discovery Participant DATA(P) messages
     bool dropParticipantBuiltinTopicData;
     //! Flag to enable dropping of discovery Writer DATA(W) messages

diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.cpp b/src/cpp/rtps/transport/test_UDPv4Transport.cpp
@@ -45,7 +45,11 @@ test_UDPv4TransportDescriptor::DestinationLocatorFilter test_UDPv4Transport::loc
 test_UDPv4Transport::test_UDPv4Transport(
         const test_UDPv4TransportDescriptor& descriptor)
     : drop_data_messages_percentage_(descriptor.dropDataMessagesPercentage)
+    , drop_participant_builtin_data_messages_percentage_(descriptor.dropParticipantBuiltinDataMessagesPercentage)
+    , drop_publication_builtin_data_messages_percentage_(descriptor.dropPublicationBuiltinDataMessagesPercentage)
+    , drop_subscription_builtin_data_messages_percentage_(descriptor.dropSubscriptionBuiltinDataMessagesPercentage)
     , drop_data_messages_filter_(descriptor.drop_data_messages_filter_)
+    , drop_builtin_data_messages_filter_(descriptor.drop_builtin_data_messages_filter_)
     , drop_participant_builtin_topic_data_(descriptor.dropParticipantBuiltinTopicData)
     , drop_publication_builtin_topic_data_(descriptor.dropPublicationBuiltinTopicData)
     , drop_subscription_builtin_topic_data_(descriptor.dropSubscriptionBuiltinTopicData)
@@ -78,13 +82,17 @@ test_UDPv4Transport::test_UDPv4Transport(
 test_UDPv4TransportDescriptor::test_UDPv4TransportDescriptor()
     : SocketTransportDescriptor(s_maximumMessageSize, s_maximumInitialPeersRange)
     , dropDataMessagesPercentage(0)
+    , dropParticipantBuiltinDataMessagesPercentage(0)
+    , dropPublicationBuiltinDataMessagesPercentage(0)
+    , dropSubscriptionBuiltinDataMessagesPercentage(0)
     , drop_data_messages_filter_([](CDRMessage_t&)
             {
                 return false;
             })
-    , dropParticipantBuiltinTopicData(false)
-    , dropPublicationBuiltinTopicData(false)
-    , dropSubscriptionBuiltinTopicData(false)
+    , drop_builtin_data_messages_filter_([](CDRMessage_t&)
+            {
+                return false;
+            })
     , dropDataFragMessagesPercentage(0)
     , drop_data_frag_messages_filter_([](CDRMessage_t&)
             {
@@ -376,20 +384,44 @@ bool test_UDPv4Transport::packet_should_drop(
                     {
                         return true;
                     }
+                    else if (should_be_dropped(&drop_participant_builtin_data_messages_percentage_))
+                    {
+                        return true;
+                    }
+                    else if (drop_builtin_data_messages_filter_(cdrMessage))
+                    {
+                        return true;
+                    }
                 }
                 else if (writer_id == fastrtps::rtps::c_EntityId_SEDPPubWriter)
                 {
                     if (drop_publication_builtin_topic_data_)
                     {
                         return true;
                     }
+                    else if (should_be_dropped(&drop_publication_builtin_data_messages_percentage_))
+                    {
+                        return true;
+                    }
+                    else if (drop_builtin_data_messages_filter_(cdrMessage))
+                    {
+                        return true;
+                    }
                 }
                 else if (writer_id == fastrtps::rtps::c_EntityId_SEDPSubWriter)
                 {
                     if (drop_subscription_builtin_topic_data_)
                     {
                         return true;
                     }
+                    else if (should_be_dropped(&drop_subscription_builtin_data_messages_percentage_))
+                    {
+                        return true;
+                    }
+                    else if (drop_builtin_data_messages_filter_(cdrMessage))
+                    {
+                        return true;
+                    }
                 }
                 else
                 {

diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h
@@ -85,7 +85,11 @@ class test_UDPv4Transport : public UDPv4Transport
     };
 
     PercentageData drop_data_messages_percentage_;
+    PercentageData drop_participant_builtin_data_messages_percentage_;
+    PercentageData drop_publication_builtin_data_messages_percentage_;
+    PercentageData drop_subscription_builtin_data_messages_percentage_;
     test_UDPv4TransportDescriptor::filter drop_data_messages_filter_;
+    test_UDPv4TransportDescriptor::filter drop_builtin_data_messages_filter_;
     bool drop_participant_builtin_topic_data_;
     bool drop_publication_builtin_topic_data_;
     bool drop_subscription_builtin_topic_data_;