Skip to content

[23482] Improve latency tests (backport #5998) #6024

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

Open
wants to merge 1 commit into
base: 3.3.x
Choose a base branch
from
Open

[23482] Improve latency tests (backport #5998) #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 4 additions & 26 deletions test/performance/latency/LatencyTestPublisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ LatencyTestPublisher::LatencyTestPublisher()

LatencyTestPublisher::~LatencyTestPublisher()
{
std::string TestCommandType("TestCommandType");
participant_->unregister_type(TestCommandType);

DomainParticipantFactory::get_instance()->delete_participant(participant_);

EPROSIMA_LOG_INFO(LatencyTest, "Pub: Participant removed");
}

Expand Down Expand Up @@ -689,28 +684,11 @@ void LatencyTestPublisher::run()

void LatencyTestPublisher::destroy_user_entities()
{
// Static type endpoints should have been removed for each payload iteration
if (dynamic_types_)
{
destroy_data_endpoints();
}
else if (nullptr != data_writer_
|| nullptr != data_reader_
|| nullptr != latency_data_pub_topic_
|| nullptr != latency_data_sub_topic_
|| !latency_data_type_)
{
EPROSIMA_LOG_ERROR(LATENCYPUBLISHER, "ERROR unregistering the DATA type and/or removing the endpoints");
}

subscriber_->delete_datareader(command_reader_);
participant_->delete_subscriber(subscriber_);
// Delete DDS entities contained within the DomainParticipant
participant_->delete_contained_entities();

publisher_->delete_datawriter(command_writer_);
participant_->delete_publisher(publisher_);

participant_->delete_topic(latency_command_sub_topic_);
participant_->delete_topic(latency_command_pub_topic_);
// Delete DomainParticipant
DomainParticipantFactory::get_instance()->delete_participant(participant_);
}

void LatencyTestPublisher::export_csv(
Expand Down
30 changes: 4 additions & 26 deletions test/performance/latency/LatencyTestSubscriber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ LatencyTestSubscriber::LatencyTestSubscriber()

LatencyTestSubscriber::~LatencyTestSubscriber()
{
std::string TestCommandType("TestCommandType");
participant_->unregister_type(TestCommandType);

DomainParticipantFactory::get_instance()->delete_participant(participant_);

EPROSIMA_LOG_INFO(LatencyTest, "Sub: Participant removed");
}

Expand Down Expand Up @@ -642,28 +637,11 @@ void LatencyTestSubscriber::run()

void LatencyTestSubscriber::destroy_user_entities()
{
// Static type endpoints should have been remove for each payload iteration
if (dynamic_types_)
{
destroy_data_endpoints();
}
else if (nullptr != data_writer_
|| nullptr != data_reader_
|| nullptr != latency_data_pub_topic_
|| nullptr != latency_data_sub_topic_
|| !latency_data_type_)
{
EPROSIMA_LOG_ERROR(LATENCYSUBSCRIBER, "ERROR unregistering the DATA type and/or removing the endpoints");
}

subscriber_->delete_datareader(command_reader_);
participant_->delete_subscriber(subscriber_);
// Delete DDS entities contained within the DomainParticipant
participant_->delete_contained_entities();

publisher_->delete_datawriter(command_writer_);
participant_->delete_publisher(publisher_);

participant_->delete_topic(latency_command_sub_topic_);
participant_->delete_topic(latency_command_pub_topic_);
// Delete DomainParticipant
DomainParticipantFactory::get_instance()->delete_participant(participant_);
}

bool LatencyTestSubscriber::test(
Expand Down
6 changes: 0 additions & 6 deletions test/performance/latency/main_LatencyTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
#include <fastdds/dds/log/Colors.hpp>
#include <fastdds/dds/log/Log.hpp>

#include "../optionarg.hpp"
#include "LatencyTestPublisher.hpp"
Expand Down Expand Up @@ -185,11 +184,6 @@ int main(
int argc,
char** argv)
{

using Log = eprosima::fastdds::dds::Log;
Log::SetVerbosity(Log::Kind::Info);
Log::SetCategoryFilter(std::regex("LatencyTest"));

int columns;

#if defined(_WIN32)
Expand Down
40 changes: 40 additions & 0 deletions test/performance/latency/xml/interprocess_reliable_shm_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
</rtps>
</participant>
<data_writer profile_name="pub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -32,6 +42,16 @@
</qos>
</data_writer>
<data_reader profile_name="pub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand Down Expand Up @@ -63,6 +83,16 @@
</rtps>
</participant>
<data_writer profile_name="sub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -76,6 +106,16 @@
</qos>
</data_writer>
<data_reader profile_name="sub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand Down
40 changes: 40 additions & 0 deletions test/performance/latency/xml/interprocess_reliable_udp_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
</rtps>
</participant>
<data_writer profile_name="pub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -35,6 +45,16 @@
</qos>
</data_writer>
<data_reader profile_name="pub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -60,6 +80,16 @@
</rtps>
</participant>
<data_writer profile_name="sub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -73,6 +103,16 @@
</qos>
</data_writer>
<data_reader profile_name="sub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_ALL</kind>
</historyQos>
<resourceLimitsQos>
<max_samples>11000</max_samples>
<max_samples_per_instance>11000</max_samples_per_instance>
<allocated_samples>11000</allocated_samples>
</resourceLimitsQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand Down
24 changes: 24 additions & 0 deletions test/performance/latency/xml/intraprocess_reliable_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
</rtps>
</participant>
<data_writer profile_name="pub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_LAST</kind>
<depth>2500</depth>
</historyQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -36,6 +42,12 @@
</qos>
</data_writer>
<data_reader profile_name="pub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_LAST</kind>
<depth>2500</depth>
</historyQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand Down Expand Up @@ -71,6 +83,12 @@
</rtps>
</participant>
<data_writer profile_name="sub_publisher_profile">
<topic>
<historyQos>
<kind>KEEP_LAST</kind>
<depth>2500</depth>
</historyQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand All @@ -84,6 +102,12 @@
</qos>
</data_writer>
<data_reader profile_name="sub_subscriber_profile">
<topic>
<historyQos>
<kind>KEEP_LAST</kind>
<depth>2500</depth>
</historyQos>
</topic>
<qos>
<reliability>
<kind>RELIABLE</kind>
Expand Down
Loading