Make on_xxx_matched thread-safe (#6371)

* Refs #21355. Added regression test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21355. Improve readability in EDP.cpp.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21355. Protect `InnerDataWriterListener::on_writer_matched`.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21355. Protect `InnerDataReaderListener::on_reader_matched`.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit de70d42)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.hpp
#	src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
#	test/blackbox/common/DDSBlackboxTestsDiscovery.cpp

Author: MiguelCompany

src/cpp/fastdds/publisher/DataWriterImpl.cpp

@@ -1286,6 +1286,8 @@ void DataWriterImpl::InnerDataWriterListener::onWriterMatched(
         RTPSWriter* /*writer*/,
         const PublicationMatchedStatus& info)
 {
+    std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);
+
     data_writer_->update_publication_matched_status(info);
 
     StatusMask notify_status = StatusMask::publication_matched();

src/cpp/fastdds/publisher/DataWriterImpl.hpp

@@ -459,11 +459,17 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
                 const uint32_t& status_id);
 #endif //FASTDDS_STATISTICS
 
+    private:
+
         DataWriterImpl* data_writer_;
+<<<<<<< HEAD
 
     private:
 
         using fastrtps::rtps::WriterListener::onWriterMatched;
+=======
+        std::mutex matching_info_mutex_;
+>>>>>>> de70d42f6 (Make `on_xxx_matched` thread-safe (#6371))
     }
     writer_listener_;
 

src/cpp/fastdds/subscriber/DataReaderImpl.cpp

@@ -941,6 +941,8 @@ void DataReaderImpl::InnerDataReaderListener::onReaderMatched(
         RTPSReader* /*reader*/,
         const SubscriptionMatchedStatus& info)
 {
+    std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);
+
     data_reader_->update_subscription_matched_status(info);
 
     StatusMask notify_status = StatusMask::subscription_matched();

src/cpp/fastdds/subscriber/DataReaderImpl.hpp

@@ -448,7 +448,10 @@ class DataReaderImpl
                 const uint32_t& status_id);
 #endif //FASTDDS_STATISTICS
 
+    private:
+
         DataReaderImpl* data_reader_;
+        std::mutex matching_info_mutex_;
 
     private: