From 9a2c44ba0068ee34fea0a1eb127be8da00829bde Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Thu, 9 Jan 2025 07:14:43 -0800 Subject: [PATCH 1/2] Fix EDP reliability timings (#5540) * EDP default configuration should be in milliseconds, not microseconds. Signed-off-by: Tomoya Fujita * add the timeout for writer->wait_discovery(). Signed-off-by: Tomoya Fujita * Refs #22537: test fix Signed-off-by: Mario Dominguez --------- Signed-off-by: Tomoya Fujita Signed-off-by: Mario Dominguez Co-authored-by: Mario Dominguez (cherry picked from commit b53a3899e035dcb3bc8c39d392a66a3a236bc4bb) # Conflicts: # src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp --- src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp | 7 +++++++ test/blackbox/common/DDSBlackboxTestsStatistics.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 521400becce..059d6da4b76 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -54,10 +54,17 @@ namespace fastrtps { namespace rtps { // Default configuration values for EDP entities. +<<<<<<< HEAD static const Duration_t edp_heartbeat_period{1, 0}; // 1 second static const Duration_t edp_nack_response_delay{0, 100 * 1000 }; // 100 milliseconds static const Duration_t edp_nack_supression_duration{0, 10 * 1000}; // 10 milliseconds static const Duration_t edp_heartbeat_response_delay{0, 10 * 1000}; // 10 milliseconds +======= +static const dds::Duration_t edp_heartbeat_period{1, 0}; // 1 second +static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 * 1000 }; // 100 milliseconds +static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000 * 1000}; // 10 milliseconds +static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000 * 1000}; // 10 milliseconds +>>>>>>> b53a3899 (Fix EDP reliability timings (#5540)) static const int32_t edp_reader_initial_reserved_caches = 1; static const int32_t edp_writer_initial_reserved_caches = 20; diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp index 8e7c0018a22..543f1fba233 100644 --- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp +++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp @@ -765,7 +765,7 @@ TEST(DDSStatistics, correct_deletion_upon_delete_contained_entities) writer->init(); ASSERT_TRUE(writer->isInitialized()); writer->wait_discovery(); - writer->send(*data, 10); + writer->send(*data, 200); writer->destroy(); })); From c684daa6a8388554856d332e42af9614bac8e2c3 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 10 Jan 2025 07:39:37 +0100 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Miguel Company --- .../rtps/builtin/discovery/endpoint/EDPSimple.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 059d6da4b76..42488784eb2 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -54,17 +54,10 @@ namespace fastrtps { namespace rtps { // Default configuration values for EDP entities. -<<<<<<< HEAD static const Duration_t edp_heartbeat_period{1, 0}; // 1 second -static const Duration_t edp_nack_response_delay{0, 100 * 1000 }; // 100 milliseconds -static const Duration_t edp_nack_supression_duration{0, 10 * 1000}; // 10 milliseconds -static const Duration_t edp_heartbeat_response_delay{0, 10 * 1000}; // 10 milliseconds -======= -static const dds::Duration_t edp_heartbeat_period{1, 0}; // 1 second -static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 * 1000 }; // 100 milliseconds -static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000 * 1000}; // 10 milliseconds -static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000 * 1000}; // 10 milliseconds ->>>>>>> b53a3899 (Fix EDP reliability timings (#5540)) +static const Duration_t edp_nack_response_delay{0, 100 * 1000 * 1000 }; // 100 milliseconds +static const Duration_t edp_nack_supression_duration{0, 10 * 1000 * 1000}; // 10 milliseconds +static const Duration_t edp_heartbeat_response_delay{0, 10 * 1000 * 1000}; // 10 milliseconds static const int32_t edp_reader_initial_reserved_caches = 1; static const int32_t edp_writer_initial_reserved_caches = 20;