Make on_xxx_matched thread-safe (#6371) (#6382)

mergify[bot] · MiguelCompany · cferreiragonz · web-flow · commit 35fd9c5b91b9 · 2026-07-23T15:11:29.000+02:00
* 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) * Uncrustify Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/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();
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp
@@ -459,11 +459,11 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
                 const uint32_t& status_id);
 #endif //FASTDDS_STATISTICS
 
-        DataWriterImpl* data_writer_;
-
     private:
 
         using fastrtps::rtps::WriterListener::onWriterMatched;
+        std::mutex matching_info_mutex_;
+        DataWriterImpl* data_writer_;
     }
     writer_listener_;
 
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/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();
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp b/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:
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp

Original file line number	Diff line number	Diff line change
`@@ -1286,6 +1286,8 @@ void DataWriterImpl::InnerDataWriterListener::onWriterMatched(`
`1286`	`1286`	`RTPSWriter* /writer/,`
`1287`	`1287`	`const PublicationMatchedStatus& info)`
`1288`	`1288`	`{`
	`1289`	`+ std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);`
	`1290`	`+`
`1289`	`1291`	`data_writer_->update_publication_matched_status(info);`
`1290`	`1292`
`1291`	`1293`	`StatusMask notify_status = StatusMask::publication_matched();`
Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,8 @@ void DataReaderImpl::InnerDataReaderListener::onReaderMatched(`
`941`	`941`	`RTPSReader* /reader/,`
`942`	`942`	`const SubscriptionMatchedStatus& info)`
`943`	`943`	`{`
	`944`	`+ std::lock_guard<std::mutex> scoped_lock(matching_info_mutex_);`
	`945`	`+`
`944`	`946`	`data_reader_->update_subscription_matched_status(info);`
`945`	`947`
`946`	`948`	`StatusMask notify_status = StatusMask::subscription_matched();`