Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21055] Automatically unmatch remote participants on participant deletion #4849

Merged
merged 10 commits into from
May 28, 2024
Merged

[21055] Automatically unmatch remote participants on participant deletion #4849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
96cb03e
Refs #21055. Add regresion test.
MiguelCompany Apr 24, 2024
91b458a
Refs #21055. Remove `this->` on PDP.cpp
MiguelCompany May 27, 2024
75c99cc
Refs #21055. Change nullptr comparisons on PDP.cpp
MiguelCompany May 27, 2024
aa022d7
Refs #21055. Change nullptr comparisons on BuiltinProtocols.cpp
MiguelCompany May 27, 2024
06eec86
Refs #21055. Split `PDP::remove_remote_participant` in two methods.
MiguelCompany May 27, 2024
d668705
Refs #21055. Call new `PDP::disable` method when deleting `BuiltinPro…
MiguelCompany May 27, 2024
c4cf272
Refs #21055. `PDP::disable` method automatically unmatches remote par…
MiguelCompany May 27, 2024
90265e0
Refs #21055. Use `std::lock_guard` where possible.
MiguelCompany May 27, 2024
f8853b1
Refs #20995. Apply suggestion.
MiguelCompany May 27, 2024
37de2d1
Refs #20995. Fix test build.
MiguelCompany May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions include/fastdds/rtps/builtin/discovery/participant/PDP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable
*/
bool enable();

/**
* @brief Disable the Participant Discovery Protocol
*/
void disable();

virtual bool init(
RTPSParticipantImpl* part) = 0;

Expand Down Expand Up @@ -639,6 +644,22 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable
*/
void set_external_participant_properties_(
ParticipantProxyData* participant_data);

/**
* Performs all the necessary actions after removing a ParticipantProxyData from the
* participant_proxies_ collection.
*
* @param pdata ParticipantProxyData that was removed.
* @param partGUID GUID of the removed participant.
* @param reason Reason why the participant was removed.
* @param listener Listener to be notified of the unmatches / removal.
*/
void actions_on_remote_participant_removed(
ParticipantProxyData* pdata,
const GUID_t& partGUID,
ParticipantDiscoveryInfo::DISCOVERY_STATUS reason,
RTPSParticipantListener* listener);

};


Expand Down
25 changes: 14 additions & 11 deletions src/cpp/rtps/builtin/BuiltinProtocols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,12 @@ BuiltinProtocols::BuiltinProtocols()
BuiltinProtocols::~BuiltinProtocols()
{
// 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
Expand Down Expand Up @@ -199,7 +202,7 @@ bool BuiltinProtocols::addLocalWriter(
{
bool ok = true;

if (mp_PDP != nullptr)
if (nullptr != mp_PDP)
{
ok = mp_PDP->getEDP()->newLocalWriterProxyData(w, topicAtt, wqos);

Expand All @@ -214,7 +217,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);
}
Expand All @@ -234,7 +237,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);

Expand All @@ -249,7 +252,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);
}
Expand All @@ -263,7 +266,7 @@ bool BuiltinProtocols::updateLocalWriter(
const 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);
}
Expand All @@ -277,7 +280,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);
}
Expand All @@ -288,11 +291,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);
}
Expand All @@ -303,11 +306,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);
}
Expand Down
Loading
Loading