Automatically unmatch remote participants on participant deletion (#4817

) * Refs #21055. Add regresion test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Split `PDP::remove_remote_participant` in two methods. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Call new `PDP::disable` method when deleting `BuiltinProtocols`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. `PDP::disable` method automatically unmatches remote participants. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Change nullptr comparisons on PDP.cpp Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Remove `this->` on PDP.cpp Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Use `std::lock_guard` where possible. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21055. Method rename. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · May 27, 2024 · e3c1541 · e3c1541
1 parent 0023800
commit e3c1541
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 113 deletions.
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -52,19 +52,19 @@ BuiltinProtocols::BuiltinProtocols()
 
 BuiltinProtocols::~BuiltinProtocols()
 {
-    // This needs to be done first because of the WriterProxydata and ReaderProxyData smart_ptr
-    delete typelookup_manager_;
-
-    // Send participant is disposed
-    if (mp_PDP != nullptr)
+    if (nullptr != mp_PDP)
     {
+        // Send participant is disposed
         mp_PDP->announceParticipantState(true, true);
+        // Consider all discovered participants as disposed
+        mp_PDP->disable();
     }
 
-    // TODO Auto-generated destructor stub
+    // The type lookup manager should be deleted first, since it will access the PDP database
+    delete typelookup_manager_;
+
     delete mp_WLP;
     delete mp_PDP;
-
 }
 
 bool BuiltinProtocols::initBuiltinProtocols(
@@ -193,7 +193,7 @@ bool BuiltinProtocols::addLocalWriter(
 {
     bool ok = true;
 
-    if (mp_PDP != nullptr)
+    if (nullptr != mp_PDP)
     {
         ok = mp_PDP->getEDP()->newLocalWriterProxyData(w, topicAtt, wqos);
 
@@ -208,7 +208,7 @@ bool BuiltinProtocols::addLocalWriter(
         EPROSIMA_LOG_WARNING(RTPS_EDP, "EDP is not used in this Participant, register a Writer is impossible");
     }
 
-    if (mp_WLP != nullptr)
+    if (nullptr != mp_WLP)
     {
         ok &= mp_WLP->add_local_writer(w, wqos);
     }
@@ -228,7 +228,7 @@ bool BuiltinProtocols::addLocalReader(
 {
     bool ok = true;
 
-    if (mp_PDP != nullptr)
+    if (nullptr != mp_PDP)
     {
         ok = mp_PDP->getEDP()->newLocalReaderProxyData(R, topicAtt, rqos, content_filter);
 
@@ -243,7 +243,7 @@ bool BuiltinProtocols::addLocalReader(
         EPROSIMA_LOG_WARNING(RTPS_EDP, "EDP is not used in this Participant, register a Reader is impossible");
     }
 
-    if (mp_WLP != nullptr)
+    if (nullptr != mp_WLP)
     {
         ok &= mp_WLP->add_local_reader(R, rqos);
     }
@@ -257,7 +257,7 @@ bool BuiltinProtocols::updateLocalWriter(
         const fastdds::dds::WriterQos& wqos)
 {
     bool ok = false;
-    if (mp_PDP != nullptr && mp_PDP->getEDP() != nullptr)
+    if ((nullptr != mp_PDP) && (nullptr != mp_PDP->getEDP()))
     {
         ok = mp_PDP->getEDP()->updatedLocalWriter(W, topicAtt, wqos);
     }
@@ -271,7 +271,7 @@ bool BuiltinProtocols::updateLocalReader(
         const fastdds::rtps::ContentFilterProperty* content_filter)
 {
     bool ok = false;
-    if (mp_PDP != nullptr && mp_PDP->getEDP() != nullptr)
+    if ((nullptr != mp_PDP) && (nullptr != mp_PDP->getEDP()))
     {
         ok = mp_PDP->getEDP()->updatedLocalReader(R, topicAtt, rqos, content_filter);
     }
@@ -282,11 +282,11 @@ bool BuiltinProtocols::removeLocalWriter(
         RTPSWriter* W)
 {
     bool ok = false;
-    if (mp_WLP != nullptr)
+    if (nullptr != mp_WLP)
     {
         ok |= mp_WLP->remove_local_writer(W);
     }
-    if (mp_PDP != nullptr && mp_PDP->getEDP() != nullptr)
+    if ((nullptr != mp_PDP) && (nullptr != mp_PDP->getEDP()))
     {
         ok |= mp_PDP->getEDP()->removeLocalWriter(W);
     }
@@ -297,11 +297,11 @@ bool BuiltinProtocols::removeLocalReader(
         RTPSReader* R)
 {
     bool ok = false;
-    if (mp_WLP != nullptr)
+    if (nullptr != mp_WLP)
     {
         ok |= mp_WLP->remove_local_reader(R);
     }
-    if (mp_PDP != nullptr && mp_PDP->getEDP() != nullptr)
+    if ((nullptr != mp_PDP) && (nullptr != mp_PDP->getEDP()))
     {
         ok |= mp_PDP->getEDP()->removeLocalReader(R);
     }