Fix EDP reliability timings (#5540) (#5556)

* Fix EDP reliability timings (#5540)

* EDP default configuration should be in milliseconds, not microseconds.

Signed-off-by: Tomoya Fujita <[email protected]>

* add the timeout for writer->wait_discovery().

Signed-off-by: Tomoya Fujita <[email protected]>

* Refs #22537: test fix

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Tomoya Fujita <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
Co-authored-by: Mario Dominguez <[email protected]>
(cherry picked from commit b53a389)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp

* Fix conflicts

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Tomoya Fujita <[email protected]>
Co-authored-by: Miguel Company <[email protected]>

Author: 3 people

src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp

@@ -55,9 +55,9 @@ namespace rtps {
 
 // Default configuration values for EDP entities.
 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 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;

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();
                 }));