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

[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

Changes from 1 commit
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
10 changes: 6 additions & 4 deletions test/blackbox/common/DDSBlackboxTestsBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
#include <fastrtps/transport/test_UDPv4TransportDescriptor.h>
#include <fastrtps/types/TypesBase.h>
#include <fastrtps/xmlparser/XMLProfileManager.h>

#include "BlackboxTests.hpp"
#include "mock/BlackboxMockConsumer.h"
Expand All @@ -66,15 +67,16 @@ using ReturnCode_t = eprosima::fastrtps::types::ReturnCode_t;
*/
TEST(DDSBasic, WarningOnDelete)
{
using namespace eprosima::fastrtps;
namespace dds = eprosima::fastdds::dds;
auto factory = dds::DomainParticipantFactory::get_instance();

// Set intraprocess delivery to full
LibrarySettings library_settings;
LibrarySettingsAttributes library_settings;
library_settings = xmlparser::XMLProfileManager::library_settings();
elianalf marked this conversation as resolved.
Show resolved Hide resolved
auto old_library_settings = library_settings;
factory->get_library_settings(library_settings);
library_settings.intraprocess_delivery = INTRAPROCESS_FULL;
factory->set_library_settings(library_settings);
xmlparser::XMLProfileManager::library_settings(library_settings);

// Create participants
auto participant_1 = factory->create_participant(0, dds::PARTICIPANT_QOS_DEFAULT);
Expand All @@ -96,7 +98,7 @@ TEST(DDSBasic, WarningOnDelete)
helper_consumer->clear_entries();

// Restore library settings
factory->set_library_settings(old_library_settings);
xmlparser::XMLProfileManager::library_settings(old_library_settings);
}

/**
Expand Down
Loading