Make messages_sent an object attribute

Signed-off-by: Juan López Fernández <[email protected]>
eProsima · Jul 7, 2023 · 9f47201 · 9f47201
1 parent dbb0d65
commit 9f47201
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.cpp b/src/cpp/rtps/transport/test_UDPv4Transport.cpp
@@ -32,6 +32,7 @@ using SubmessageHeader_t = fastrtps::rtps::SubmessageHeader_t;
 using SequenceNumber_t = fastrtps::rtps::SequenceNumber_t;
 using EntityId_t = fastrtps::rtps::EntityId_t;
 
+std::map<const test_UDPv4TransportDescriptor*, test_UDPv4Transport*> test_UDPv4Transport::created_transports{};
 std::vector<std::vector<octet>> test_UDPv4Transport::test_UDPv4Transport_DropLog;
 std::atomic<uint32_t> test_UDPv4Transport::test_UDPv4Transport_DropLogLength(0);
 std::atomic<bool> test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork(false);
@@ -41,7 +42,6 @@ test_UDPv4TransportDescriptor::DestinationLocatorFilter test_UDPv4Transport::loc
         {
             return false;
         });
-std::map<uint32_t, uint32_t> test_UDPv4Transport::messages_sent{};
 
 test_UDPv4Transport::test_UDPv4Transport(
         const test_UDPv4TransportDescriptor& descriptor)
@@ -122,7 +122,9 @@ test_UDPv4TransportDescriptor::test_UDPv4TransportDescriptor()
 
 TransportInterface* test_UDPv4TransportDescriptor::create_transport() const
 {
-    return new test_UDPv4Transport(*this);
+    test_UDPv4Transport* transport = new test_UDPv4Transport(*this);
+    test_UDPv4Transport::created_transports[this] = transport;
+    return transport;
 }
 
 bool test_UDPv4TransportDescriptor::operator ==(

diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h
@@ -53,6 +53,7 @@ class test_UDPv4Transport : public UDPv4Transport
     virtual LocatorList NormalizeLocator(
             const Locator& locator) override;
 
+    RTPS_DllAPI static std::map<const test_UDPv4TransportDescriptor*, test_UDPv4Transport*> created_transports;
     RTPS_DllAPI static std::atomic<bool> test_UDPv4Transport_ShutdownAllNetwork;
     // Handle to a persistent log of dropped packets. Defaults to length 0 (no logging) to prevent wasted resources.
     RTPS_DllAPI static std::vector<std::vector<fastrtps::rtps::octet>> test_UDPv4Transport_DropLog;
@@ -63,7 +64,7 @@ class test_UDPv4Transport : public UDPv4Transport
     RTPS_DllAPI static test_UDPv4TransportDescriptor::DestinationLocatorFilter locator_filter;
 
     // Record the number of packages sent to the different ports (key)
-    RTPS_DllAPI static std::map<uint32_t, uint32_t> messages_sent;
+    RTPS_DllAPI std::map<uint32_t, uint32_t> messages_sent;
 
 protected:
 

diff --git a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
@@ -148,7 +148,7 @@ void run_parametrized_test(
     // even and user ones odd.
     // uint32_t n_packages_sent = test_UDPv4Transport::messages_sent[conditions.sub_unicast_port];
     uint32_t n_packages_sent = 0;
-    for (const auto& item : test_UDPv4Transport::messages_sent)
+    for (const auto& item : test_UDPv4Transport::created_transports[pub_udp_descriptor.get()]->messages_sent)
     {
         if (item.first % 2)
         {