Skip to content

Commit

Permalink
Fix EDP reliability timings (#5540)
Browse files Browse the repository at this point in the history
* EDP default configuration should be in milliseconds, not microseconds.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

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

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* Refs #22537: test fix

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
  • Loading branch information
fujitatomoya and Mario-DL authored Jan 9, 2025
1 parent 25a694c commit b53a389
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ namespace rtps {

// Default configuration values for EDP entities.
static const dds::Duration_t edp_heartbeat_period{1, 0}; // 1 second
static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 }; // 100 milliseconds
static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000}; // 10 milliseconds
static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000}; // 10 milliseconds
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

static const int32_t edp_reader_initial_reserved_caches = 1;
static const int32_t edp_writer_initial_reserved_caches = 20;
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/common/DDSBlackboxTestsStatistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,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();
}));

Expand Down

0 comments on commit b53a389

Please sign in to comment.