From f7082444ff503198ca63dad7d940f8ad0436f623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Dom=C3=ADnguez=20L=C3=B3pez?= <116071334+Mario-DL@users.noreply.github.com> Date: Thu, 21 Mar 2024 07:47:57 +0100 Subject: [PATCH] Effectively assert automatic/manual_by_participant liveliness (#4501) * Refs #20584: Add BB test Signed-off-by: Mario Dominguez * Refs #20584: Fix Signed-off-by: Mario Dominguez * Refs #20584: Update LivelinessManager tests Signed-off-by: Mario Dominguez * Refs #20584: Linter Signed-off-by: Mario Dominguez * Refs #20584: Apply reviewer suggestions Signed-off-by: Mario Dominguez * Refs #20584: Fix PubSubParticipant comparison and add padding between writer announcement period and lease duration test's writers Signed-off-by: Mario Dominguez --------- Signed-off-by: Mario Dominguez --- .../fastdds/rtps/writer/LivelinessManager.h | 6 +- src/cpp/rtps/builtin/liveliness/WLP.cpp | 4 +- .../rtps/builtin/liveliness/WLPListener.cpp | 4 +- src/cpp/rtps/writer/LivelinessManager.cpp | 9 +- .../api/dds-pim/PubSubParticipant.hpp | 16 + .../fastrtps_deprecated/PubSubParticipant.hpp | 16 + .../common/BlackboxTestsLivelinessQos.cpp | 52 ++++ .../rtps/writer/LivelinessManagerTests.cpp | 279 +++++++++--------- 8 files changed, 246 insertions(+), 140 deletions(-) diff --git a/include/fastdds/rtps/writer/LivelinessManager.h b/include/fastdds/rtps/writer/LivelinessManager.h index d99db0f6e00..a8efa9fecfd 100644 --- a/include/fastdds/rtps/writer/LivelinessManager.h +++ b/include/fastdds/rtps/writer/LivelinessManager.h @@ -105,12 +105,14 @@ class LivelinessManager Duration_t lease_duration); /** - * @brief Asserts liveliness of writers with given liveliness kind + * @brief Asserts liveliness of writers with given liveliness kind and GuidPrefix * @param kind Liveliness kind + * @param guid_prefix The guid prefix of the writers to assert liveliness of * @return True if liveliness was successfully asserted */ bool assert_liveliness( - LivelinessQosPolicyKind kind); + LivelinessQosPolicyKind kind, + GuidPrefix_t guid_prefix); /** * @brief A method to check any writer of the given kind is alive diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index 811eab184d3..7283076e2c6 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -974,7 +974,9 @@ bool WLP::assert_liveliness_manual_by_participant() { if (manual_by_participant_writers_.size() > 0) { - return pub_liveliness_manager_->assert_liveliness(MANUAL_BY_PARTICIPANT_LIVELINESS_QOS); + return pub_liveliness_manager_->assert_liveliness( + MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, + mp_participant->getGuid().guidPrefix); } return false; } diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp index ff5683fe3c4..273fad11e06 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp @@ -145,11 +145,11 @@ void WLPListener::onNewCacheChangeAdded( history->getMutex()->unlock(); if (mp_WLP->automatic_readers_) { - mp_WLP->sub_liveliness_manager_->assert_liveliness(AUTOMATIC_LIVELINESS_QOS); + mp_WLP->sub_liveliness_manager_->assert_liveliness(AUTOMATIC_LIVELINESS_QOS, guidP); } if (livelinessKind == MANUAL_BY_PARTICIPANT_LIVELINESS_QOS) { - mp_WLP->sub_liveliness_manager_->assert_liveliness(MANUAL_BY_PARTICIPANT_LIVELINESS_QOS); + mp_WLP->sub_liveliness_manager_->assert_liveliness(MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, guidP); } mp_WLP->mp_builtinProtocols->mp_PDP->getMutex()->unlock(); history->getMutex()->lock(); diff --git a/src/cpp/rtps/writer/LivelinessManager.cpp b/src/cpp/rtps/writer/LivelinessManager.cpp index a5e395366a1..42ed418dfec 100644 --- a/src/cpp/rtps/writer/LivelinessManager.cpp +++ b/src/cpp/rtps/writer/LivelinessManager.cpp @@ -187,7 +187,8 @@ bool LivelinessManager::assert_liveliness( { for (LivelinessData& w: writers_) { - if (w.kind == writer.kind) + if (w.kind == writer.kind && + w.guid.guidPrefix == guid.guidPrefix) { assert_writer_liveliness(w); } @@ -232,7 +233,8 @@ bool LivelinessManager::assert_liveliness( } bool LivelinessManager::assert_liveliness( - LivelinessQosPolicyKind kind) + LivelinessQosPolicyKind kind, + GuidPrefix_t guid_prefix) { if (!manage_automatic_ && kind == LivelinessQosPolicyKind::AUTOMATIC_LIVELINESS_QOS) @@ -253,7 +255,8 @@ bool LivelinessManager::assert_liveliness( for (LivelinessData& writer: writers_) { - if (writer.kind == kind) + if (writer.kind == kind && + guid_prefix == writer.guid.guidPrefix) { assert_writer_liveliness(writer); } diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp index 7eb510fec9f..ceee9578df4 100644 --- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp +++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp @@ -613,6 +613,22 @@ class PubSubParticipant }); } + template + size_t sub_wait_liveliness_lost_for( + unsigned int expected_num_lost, + const std::chrono::duration<_Rep, _Period>& max_wait) + { + std::unique_lock lock(sub_liveliness_mutex_); + sub_liveliness_cv_.wait_for(lock, max_wait, [this, &expected_num_lost]() -> bool + { + return sub_times_liveliness_lost_ >= expected_num_lost; + }); + + return sub_times_liveliness_lost_; + } + PubSubParticipant& property_policy( const eprosima::fastrtps::rtps::PropertyPolicy property_policy) { diff --git a/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp b/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp index 6e6cf2904b6..3131dc4efd5 100644 --- a/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp +++ b/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp @@ -401,6 +401,22 @@ class PubSubParticipant }); } + template + size_t sub_wait_liveliness_lost_for( + unsigned int expected_num_lost, + const std::chrono::duration<_Rep, _Period>& max_wait) + { + std::unique_lock lock(sub_liveliness_mutex_); + sub_liveliness_cv_.wait_for(lock, max_wait, [this, &expected_num_lost]() -> bool + { + return sub_times_liveliness_lost_ >= expected_num_lost; + }); + + return sub_times_liveliness_lost_; + } + PubSubParticipant& property_policy( const eprosima::fastrtps::rtps::PropertyPolicy property_policy) { diff --git a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp index c3206dbc566..662cf66ec4e 100644 --- a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp +++ b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp @@ -26,6 +26,8 @@ #include #include +#include + using namespace eprosima::fastrtps; using namespace eprosima::fastrtps::rtps; @@ -1946,6 +1948,56 @@ TEST(LivelinessTests, Detect_Deadlock_ManualByParticipant_Intraprocess) // Test failure is due to timeout } +// Regression test of Refs #20584, github issue #4373 +TEST(LivelinessTests, Reader_Successfully_Asserts_Liveliness_on_a_Disconnected_Writer) +{ + // Create a TestTransport to simulate a network shutdown (Ctrl+C) + auto testTransport = std::make_shared(); + + // Create two writer participants + PubSubWriter writer_1(TEST_TOPIC_NAME); + PubSubWriter writer_2(TEST_TOPIC_NAME + "2"); + + // Create a reader participant containing 2 subscribers and readers + PubSubParticipant reader(0, 2, 0, 2); + + reader.init_participant(); + // Define the reader's lease duration in 1.6 secs + reader.sub_liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 600000000)); + + // Create Subscribers and readers, one for each writer + reader.sub_topic_name(TEST_TOPIC_NAME); + reader.init_subscriber(0); + reader.sub_topic_name(TEST_TOPIC_NAME + "2"); + reader.init_subscriber(1); + + // Create writers + writer_1.disable_builtin_transport() + .lease_duration(c_TimeInfinite, 1) + .add_user_transport_to_pparams(testTransport) + .liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 0)) + .liveliness_kind(eprosima::fastdds::dds::AUTOMATIC_LIVELINESS_QOS) + .liveliness_announcement_period(eprosima::fastrtps::Time_t(0, 500000000)) + .init(); + + writer_2.lease_duration(c_TimeInfinite, 1) + .liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 0)) + .liveliness_kind(eprosima::fastdds::dds::AUTOMATIC_LIVELINESS_QOS) + .liveliness_announcement_period(eprosima::fastrtps::Time_t(0, 500000000)) + .init(); + + // Wait for discovery to occur. Liveliness should be recovered twice, + // one per matched reader. + reader.sub_wait_liveliness_recovered(2); + + // Simulate a Ctrl+C in one of the writers + eprosima::fastdds::rtps::test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork = true; + + // After 1.6 secs, we should receive a on_liveliness_changed(status lost) + // in the TEST_TOPIC_NAME reader that was matched with the disconnected writer_1 + ASSERT_EQ(reader.sub_wait_liveliness_lost_for(1, std::chrono::seconds(4)), 1u); +} + #ifdef INSTANTIATE_TEST_SUITE_P #define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w) #else diff --git a/test/unittest/rtps/writer/LivelinessManagerTests.cpp b/test/unittest/rtps/writer/LivelinessManagerTests.cpp index 05a4e06c2b1..03ed08ababb 100644 --- a/test/unittest/rtps/writer/LivelinessManagerTests.cpp +++ b/test/unittest/rtps/writer/LivelinessManagerTests.cpp @@ -25,75 +25,87 @@ class LivelinessManagerTests : public ::testing::Test { - public: - - LivelinessManagerTests() : service_() {} - - void SetUp() - { - service_.init_thread(); - - writer_losing_liveliness = eprosima::fastrtps::rtps::GUID_t(); - writer_recovering_liveliness = eprosima::fastrtps::rtps::GUID_t(); - num_writers_lost = 0; - num_writers_recovered = 0; - } - - void TearDown() - { - } - - void run() - { - } - - eprosima::fastrtps::rtps::ResourceEvent service_; - - // Callback to test the liveliness manager - - void liveliness_changed(eprosima::fastrtps::rtps::GUID_t guid, - const eprosima::fastrtps::LivelinessQosPolicyKind&, - const eprosima::fastrtps::Duration_t&, - int alive_change, - int not_alive_change) +public: + + LivelinessManagerTests() + : service_() + { + } + + void SetUp() + { + service_.init_thread(); + + writer_losing_liveliness = eprosima::fastrtps::rtps::GUID_t(); + writer_recovering_liveliness = eprosima::fastrtps::rtps::GUID_t(); + num_writers_lost = 0; + num_writers_recovered = 0; + } + + void TearDown() + { + } + + void run() + { + } + + eprosima::fastrtps::rtps::ResourceEvent service_; + + // Callback to test the liveliness manager + + void liveliness_changed( + eprosima::fastrtps::rtps::GUID_t guid, + const eprosima::fastrtps::LivelinessQosPolicyKind&, + const eprosima::fastrtps::Duration_t&, + int alive_change, + int not_alive_change) + { + if (alive_change > 0) { - if (alive_change > 0) - { - std::unique_lock lock(liveliness_recovered_mutex_); - writer_recovering_liveliness = guid; - num_writers_recovered++; - liveliness_recovered_cv_.notify_one(); - } - else if (not_alive_change > 0) - { - std::unique_lock lock(liveliness_lost_mutex_); - writer_losing_liveliness = guid; - num_writers_lost++; - liveliness_lost_cv_.notify_one(); - } + std::unique_lock lock(liveliness_recovered_mutex_); + writer_recovering_liveliness = guid; + num_writers_recovered++; + liveliness_recovered_cv_.notify_one(); } - - void wait_liveliness_lost(unsigned int num_lost) + else if (not_alive_change > 0) { std::unique_lock lock(liveliness_lost_mutex_); - liveliness_lost_cv_.wait(lock, [&](){ return num_writers_lost == num_lost; }); - } - - void wait_liveliness_recovered(unsigned int num_recovered) - { - std::unique_lock lock(liveliness_recovered_mutex_); - liveliness_recovered_cv_.wait(lock, [&](){ return num_writers_recovered == num_recovered;}); + writer_losing_liveliness = guid; + num_writers_lost++; + liveliness_lost_cv_.notify_one(); } - - eprosima::fastrtps::rtps::GUID_t writer_losing_liveliness; - eprosima::fastrtps::rtps::GUID_t writer_recovering_liveliness; - unsigned int num_writers_lost; - unsigned int num_writers_recovered; - - std::mutex liveliness_lost_mutex_; - std::condition_variable liveliness_lost_cv_; - std::mutex liveliness_recovered_mutex_; - std::condition_variable liveliness_recovered_cv_; + } + + void wait_liveliness_lost( + unsigned int num_lost) + { + std::unique_lock lock(liveliness_lost_mutex_); + liveliness_lost_cv_.wait(lock, [&]() + { + return num_writers_lost == num_lost; + }); + } + + void wait_liveliness_recovered( + unsigned int num_recovered) + { + std::unique_lock lock(liveliness_recovered_mutex_); + liveliness_recovered_cv_.wait(lock, [&]() + { + return num_writers_recovered == num_recovered; + }); + } + + eprosima::fastrtps::rtps::GUID_t writer_losing_liveliness; + eprosima::fastrtps::rtps::GUID_t writer_recovering_liveliness; + unsigned int num_writers_lost; + unsigned int num_writers_recovered; + + std::mutex liveliness_lost_mutex_; + std::condition_variable liveliness_lost_cv_; + std::mutex liveliness_recovered_mutex_; + std::condition_variable liveliness_recovered_cv_; }; namespace eprosima { @@ -107,8 +119,8 @@ using eprosima::fastrtps::rtps::GUID_t; TEST_F(LivelinessManagerTests, WriterCanAlwaysBeAdded) { LivelinessManager liveliness_manager( - nullptr, - service_); + nullptr, + service_); GuidPrefix_t guidP; guidP.value[0] = 1; @@ -134,8 +146,8 @@ TEST_F(LivelinessManagerTests, WriterCanAlwaysBeAdded) TEST_F(LivelinessManagerTests, WriterCannotBeRemovedTwice) { LivelinessManager liveliness_manager( - nullptr, - service_); + nullptr, + service_); GuidPrefix_t guidP; guidP.value[0] = 1; @@ -159,8 +171,8 @@ TEST_F(LivelinessManagerTests, WriterCannotBeRemovedTwice) TEST_F(LivelinessManagerTests, AssertLivelinessByKind) { LivelinessManager liveliness_manager( - nullptr, - service_); + nullptr, + service_); GuidPrefix_t guidP; guidP.value[0] = 1; @@ -173,7 +185,7 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByKind) liveliness_manager.add_writer(GUID_t(guidP, 6), MANUAL_BY_TOPIC_LIVELINESS_QOS, Duration_t(10)); // Assert liveliness of automatic writers (the rest should be unchanged) - EXPECT_TRUE(liveliness_manager.assert_liveliness(AUTOMATIC_LIVELINESS_QOS)); + EXPECT_TRUE(liveliness_manager.assert_liveliness(AUTOMATIC_LIVELINESS_QOS, guidP)); auto liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::ALIVE); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::ALIVE); @@ -183,7 +195,7 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByKind) EXPECT_EQ(liveliness_data[5].status, LivelinessData::WriterStatus::NOT_ASSERTED); // Assert liveliness of manual by participant writers - EXPECT_TRUE(liveliness_manager.assert_liveliness(MANUAL_BY_PARTICIPANT_LIVELINESS_QOS)); + EXPECT_TRUE(liveliness_manager.assert_liveliness(MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, guidP)); liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::ALIVE); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::ALIVE); @@ -193,7 +205,7 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByKind) EXPECT_EQ(liveliness_data[5].status, LivelinessData::WriterStatus::NOT_ASSERTED); // Assert liveliness of manual by topic writers - EXPECT_TRUE(liveliness_manager.assert_liveliness(MANUAL_BY_TOPIC_LIVELINESS_QOS)); + EXPECT_TRUE(liveliness_manager.assert_liveliness(MANUAL_BY_TOPIC_LIVELINESS_QOS, guidP)); liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::ALIVE); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::ALIVE); @@ -215,8 +227,8 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByKind) TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) { LivelinessManager liveliness_manager( - nullptr, - service_); + nullptr, + service_); GuidPrefix_t guidP; guidP.value[0] = 1; @@ -230,9 +242,9 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) // If a manual by topic writer is asserted the other writers are unchanged EXPECT_TRUE(liveliness_manager.assert_liveliness( - GUID_t(guidP, 6), - MANUAL_BY_TOPIC_LIVELINESS_QOS, - Duration_t(1))); + GUID_t(guidP, 6), + MANUAL_BY_TOPIC_LIVELINESS_QOS, + Duration_t(1))); auto liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::NOT_ASSERTED); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::NOT_ASSERTED); @@ -242,9 +254,9 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) EXPECT_EQ(liveliness_data[5].status, LivelinessData::WriterStatus::ALIVE); EXPECT_TRUE(liveliness_manager.assert_liveliness( - GUID_t(guidP, 5), - MANUAL_BY_TOPIC_LIVELINESS_QOS, - Duration_t(1))); + GUID_t(guidP, 5), + MANUAL_BY_TOPIC_LIVELINESS_QOS, + Duration_t(1))); liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::NOT_ASSERTED); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::NOT_ASSERTED); @@ -255,9 +267,9 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) // If an automatic writer is asserted all automatic writers are asserted as well EXPECT_TRUE(liveliness_manager.assert_liveliness( - GUID_t(guidP, 1), - AUTOMATIC_LIVELINESS_QOS, - Duration_t(1))); + GUID_t(guidP, 1), + AUTOMATIC_LIVELINESS_QOS, + Duration_t(1))); liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::ALIVE); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::ALIVE); @@ -268,9 +280,9 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) // If a manual by participant writer is asserted all manual by participant writers are asserted as well EXPECT_TRUE(liveliness_manager.assert_liveliness( - GUID_t(guidP, 4), - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, - Duration_t(1))); + GUID_t(guidP, 4), + MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, + Duration_t(1))); liveliness_data = liveliness_manager.get_liveliness_data(); EXPECT_EQ(liveliness_data[0].status, LivelinessData::WriterStatus::ALIVE); EXPECT_EQ(liveliness_data[1].status, LivelinessData::WriterStatus::ALIVE); @@ -285,21 +297,22 @@ TEST_F(LivelinessManagerTests, AssertLivelinessByWriter) EXPECT_GT(liveliness_data[2].time, std::chrono::steady_clock::now()); EXPECT_GT(liveliness_data[3].time, std::chrono::steady_clock::now()); EXPECT_GT(liveliness_data[4].time, std::chrono::steady_clock::now()); - EXPECT_GT(liveliness_data[5].time, std::chrono::steady_clock::now());} + EXPECT_GT(liveliness_data[5].time, std::chrono::steady_clock::now()); +} //! Tests the case when the timer expires and liveliness manager is managing two automatic writers with different //! lease durations TEST_F(LivelinessManagerTests, TimerExpired_Automatic) { LivelinessManager liveliness_manager( - std::bind(&LivelinessManagerTests::liveliness_changed, - this, - std::placeholders::_1, - std::placeholders::_2, - std::placeholders::_3, - std::placeholders::_4, - std::placeholders::_5), - service_); + std::bind(&LivelinessManagerTests::liveliness_changed, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4, + std::placeholders::_5), + service_); GuidPrefix_t guidP; guidP.value[0] = 1; @@ -330,14 +343,14 @@ TEST_F(LivelinessManagerTests, TimerExpired_Automatic) TEST_F(LivelinessManagerTests, TimerExpired_ManualByParticipant) { LivelinessManager liveliness_manager( - std::bind(&LivelinessManagerTests::liveliness_changed, - this, - std::placeholders::_1, - std::placeholders::_2, - std::placeholders::_3, - std::placeholders::_4, - std::placeholders::_5), - service_); + std::bind(&LivelinessManagerTests::liveliness_changed, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4, + std::placeholders::_5), + service_); GuidPrefix_t guidP; @@ -371,14 +384,14 @@ TEST_F(LivelinessManagerTests, TimerExpired_ManualByParticipant) TEST_F(LivelinessManagerTests, TimerExpired_ManualByTopic) { LivelinessManager liveliness_manager( - std::bind(&LivelinessManagerTests::liveliness_changed, - this, - std::placeholders::_1, - std::placeholders::_2, - std::placeholders::_3, - std::placeholders::_4, - std::placeholders::_5), - service_); + std::bind(&LivelinessManagerTests::liveliness_changed, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4, + std::placeholders::_5), + service_); GuidPrefix_t guidP; @@ -417,14 +430,14 @@ TEST_F(LivelinessManagerTests, TimerExpired_ManualByTopic) TEST_F(LivelinessManagerTests, TimerOwnerCalculation) { LivelinessManager liveliness_manager( - std::bind(&LivelinessManagerTests::liveliness_changed, - this, - std::placeholders::_1, - std::placeholders::_2, - std::placeholders::_3, - std::placeholders::_4, - std::placeholders::_5), - service_); + std::bind(&LivelinessManagerTests::liveliness_changed, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4, + std::placeholders::_5), + service_); GuidPrefix_t guidP; @@ -434,7 +447,7 @@ TEST_F(LivelinessManagerTests, TimerOwnerCalculation) liveliness_manager.add_writer(GUID_t(guidP, 2), AUTOMATIC_LIVELINESS_QOS, Duration_t(1000 * 1e-3)); liveliness_manager.add_writer(GUID_t(guidP, 3), AUTOMATIC_LIVELINESS_QOS, Duration_t(500 * 1e-3)); - liveliness_manager.assert_liveliness(AUTOMATIC_LIVELINESS_QOS); + liveliness_manager.assert_liveliness(AUTOMATIC_LIVELINESS_QOS, guidP); wait_liveliness_lost(1u); EXPECT_EQ(writer_losing_liveliness, GUID_t(guidP, 1)); @@ -454,14 +467,14 @@ TEST_F(LivelinessManagerTests, TimerOwnerCalculation) TEST_F(LivelinessManagerTests, TimerOwnerRemoved) { LivelinessManager liveliness_manager( - std::bind(&LivelinessManagerTests::liveliness_changed, - this, - std::placeholders::_1, - std::placeholders::_2, - std::placeholders::_3, - std::placeholders::_4, - std::placeholders::_5), - service_); + std::bind(&LivelinessManagerTests::liveliness_changed, + this, + std::placeholders::_1, + std::placeholders::_2, + std::placeholders::_3, + std::placeholders::_4, + std::placeholders::_5), + service_); GuidPrefix_t guidP; @@ -478,10 +491,12 @@ TEST_F(LivelinessManagerTests, TimerOwnerRemoved) EXPECT_EQ(num_writers_lost, 1u); } -} -} +} // namespace fastrtps +} // namespace eprosima -int main(int argc, char **argv) +int main( + int argc, + char** argv) { testing::InitGoogleMock(&argc, argv); return RUN_ALL_TESTS();