Skip to content

Feature/280/output dds #329

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 24 commits into
base: master
Choose a base branch
from
Open

Feature/280/output dds #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ae2cdbb
Initial mockup for dds logger
javmorcas May 26, 2020
edf83c6
Change idl
javmorcas May 26, 2020
7f43a40
Add changes to get also app id
javmorcas May 26, 2020
9ff0ddf
random
javmorcas May 26, 2020
7dc6f36
Merge branch 'master' into feature/280/output-dds
Jun 2, 2020
2bb4c21
Merge branch 'feature/280/rework' into feature/280/output-dds
Jun 5, 2020
05e80a3
Add new structs and dds output format
Jun 8, 2020
6716a05
Push to review finalize error
Jun 9, 2020
49ee13a
Add changes to make finalize() work properly
javmorcas Jun 9, 2020
6980f1d
Add changes to improve DDS printer
javmorcas Jun 9, 2020
8e230e9
Change switch to polymorphism for Java
Jun 10, 2020
962cb21
Change switch to polymorphism for Cs
Jun 10, 2020
67f3ca8
noPrintIntervals modified, deleted first sum row
Jun 15, 2020
b6ee7b6
Add outputFormat dds Modern C++
Jun 15, 2020
05eb12a
Cosmetic changes
Jun 16, 2020
6117c75
Output format dds c++03
Jun 17, 2020
f0b4864
Added constructor to PerftestDDSPrinter
Jun 17, 2020
828e99a
Fix outputFormat dds Modern C++
Jun 22, 2020
4231bce
Cosmetic changes
Jun 22, 2020
a1652cb
Add support for Micro
Jun 23, 2020
62c0f44
Reverse some changes for Micro
Jun 23, 2020
fdf861c
Add doc and fixed VS2010
Jun 25, 2020
588e496
Merge branch 'bugfix/cs_compilation' into feature/280/output-dds
Jul 3, 2020
88e5646
Deleted set_data_length method in cs
Jul 3, 2020
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
18 changes: 18 additions & 0 deletions perftest_qos_profiles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,5 +1090,23 @@ _KeepDurationUsec variable name corresponds to the command-line option -keepDura
</durability>
</datawriter_qos>
</qos_profile>

<qos_profile name="LoggingQos">

<!-- === DataWriter Configuration: ================================= -->

<datawriter_qos>
<reliability>
<kind>BEST_EFFORT_RELIABILITY_QOS</kind>
</reliability>

<resource_limits>
<max_samples>10</max_samples>
<initial_samples>1</initial_samples>
<max_samples_per_instance>1</max_samples_per_instance>
</resource_limits>
</datawriter_qos>
</qos_profile>

</qos_library>
</dds>
311 changes: 311 additions & 0 deletions srcCpp/RTIDDSImpl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4274,6 +4274,317 @@ bool RTIDDSImpl_FlatData<T>::get_serialized_overhead_size(

#endif

void PerftestDDSPrinter::initialize(ParameterManager *_PM)
{
PerftestPrinter::initialize(_PM);
this->_PM = _PM;
topicName = std::string("PerftestInfo");
}

void PerftestDDSPrinter::initialize_dds_entities()
{
DDS_ReturnCode_t retcode;

DDS_DomainParticipantFactoryQos factory_qos;
DDS_DomainParticipantQos dpQos;
DDS_PublisherQos publisherQos;
DDS_DataWriterQos dwQos;

#ifndef RTI_MICRO
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we check what is the behavior when using micro? We might need to make this differently.

retcode = DDSTheParticipantFactory->get_qos(factory_qos);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"DDSTheParticipantFactory->get_qos(factory_qos)\n");
return;
}

if (!_PM->get<bool>("noXmlQos")) {
factory_qos.profile.url_profile.ensure_length(1, 1);
factory_qos.profile.url_profile[0] =
DDS_String_dup(_PM->get<std::string>("qosFile").c_str());
} else {
factory_qos.profile.string_profile.from_array(
PERFTEST_QOS_STRING,
PERFTEST_QOS_STRING_SIZE);
}

retcode = DDSTheParticipantFactory->set_qos(factory_qos);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"DDSTheParticipantFactory->set_qos(factory_qos) failed\n");
return;
}

retcode = DDSTheParticipantFactory->reload_profiles();
if ( retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"Problem opening QOS profiles file %s.\n",
_PM->get<std::string>("qosFile").c_str());
return;
}

retcode = DDSTheParticipantFactory->get_participant_qos_from_profile(
dpQos,
_PM->get<std::string>("qosLibrary").c_str(),
"LoggingQos");
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"Problem setting QoS Library \"%s::LoggingQos\" "
"for participant_qos.\n",
_PM->get<std::string>("qosLibrary").c_str());
return;
}

retcode = DDSTheParticipantFactory->get_publisher_qos_from_profile(
publisherQos,
_PM->get<std::string>("qosLibrary").c_str(),
"LoggingQos");
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"Problem setting QoS Library for publisherQos.\n");
}

retcode = DDSTheParticipantFactory->get_datawriter_qos_from_profile(
dwQos,
_PM->get<std::string>("qosLibrary").c_str(),
"LoggingQos");
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"Problem setting QoS Library for dwQos.\n");
}
#endif

//TODO: Decide if we want to use the same domain or + 1 or what.
participant = DDSTheParticipantFactory->create_participant(
(DDS_DomainId_t) (_PM->get<int>("domain") + 1),
dpQos,
NULL,
DDS_STATUS_MASK_NONE);
if (participant == NULL) {
fprintf(stderr, "PerftestDDSPrinter Problem creating participant.\n");
finalize();
}

publisher = participant->create_publisher(
publisherQos,
NULL,
DDS_STATUS_MASK_NONE);
if (publisher == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"PerftestDDSPrinter create_publisher error\n");
finalize();
}

retcode = PerftestInfo::TypeSupport::register_type(
participant,
PerftestInfo::TypeSupport::get_type_name());
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"PerftestDDSPrinter register_type error %d\n",
retcode);
finalize();
}

topic = participant->create_topic(
topicName.c_str(),
PerftestInfo::TypeSupport::get_type_name(),
DDS_TOPIC_QOS_DEFAULT,
NULL,
DDS_STATUS_MASK_NONE);
if (topic == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"PerftestDDSPrinter create_topic error\n");
finalize();
}

DDSDataWriter *writer = publisher->create_datawriter(
topic, dwQos, NULL,
DDS_STATUS_MASK_NONE);
if (writer == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"PerftestDDSPrinter create_datawriter error\n");
finalize();
}

infoDataWriter = PerftestInfo::DataWriter::narrow(writer);
if (infoDataWriter == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"DataWriter narrow error\n");
finalize();
}

perftestInfo = PerftestInfo::TypeSupport::create_data();
if (perftestInfo == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"testTypeSupport::create_data error\n");
finalize();
}

perftestInfo->latencyInfo = PerftestLatencyInfo::TypeSupport::create_data();
if (perftestInfo->latencyInfo == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"testTypeSupport::create_data error\n");
finalize();
}
perftestInfo->throughputInfo = PerftestThroughputInfo::TypeSupport::create_data();
if (perftestInfo->throughputInfo == NULL) {
fprintf(stderr,
"PerftestDDSPrinter::initialize: "
"testTypeSupport::create_data error\n");
finalize();
}

if (_PM->get<bool>("pub")) {
perftestInfo->latencyInfo->pubId = _PM->get<int>("pidMultiPubTest");
} else {
perftestInfo->throughputInfo->subId = _PM->get<int>("sidMultiSubTest");
}

fprintf(stderr,
"[Info] Publishing latency/throughput information via DDS\n");
}

void PerftestDDSPrinter::finalize()
{
DDS_ReturnCode_t retcode;

deleteDataSample();
retcode = PerftestInfo::TypeSupport::delete_data(perftestInfo);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr, "PerftestInfo::TypeSupport::delete_data error %d\n", retcode);
}

if (participant != NULL) {
retcode = participant->delete_contained_entities();
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr, "delete_contained_entities error %d\n", retcode);
}
retcode = DDSTheParticipantFactory->delete_participant(participant);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr, "delete_participant error %d\n", retcode);
}
}
}

void PerftestDDSPrinter::print_latency_interval(LatencyInfo latencyInfo)
{
this->dataWrapperLatency(latencyInfo);
DDS_ReturnCode_t retcode = infoDataWriter->write(*perftestInfo, DDS_HANDLE_NIL);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::print_latency_interval"
"write error %d\n",
retcode);
}
}

void PerftestDDSPrinter::print_throughput_interval(ThroughputInfo throughputInfo)
{
DDS_ReturnCode_t retcode;
this->dataWrapperThroughput(throughputInfo);
retcode = infoDataWriter->write(*perftestInfo, DDS_HANDLE_NIL);
if (retcode != DDS_RETCODE_OK) {
fprintf(stderr,
"PerftestDDSPrinter::print_latency_interval"
"write error %d\n",
retcode);
}
}

void PerftestDDSPrinter::deleteDataSample()
{
perftestInfo->outputCpu = NULL;
perftestInfo->latencyInfo->latency = NULL;
perftestInfo->latencyInfo->average = NULL;
perftestInfo->latencyInfo->std = NULL;
perftestInfo->latencyInfo->minimum = NULL;
perftestInfo->latencyInfo->maximum = NULL;
perftestInfo->latencyInfo->percentile50 = NULL;
perftestInfo->latencyInfo->percentile90 = NULL;
perftestInfo->latencyInfo->percentile99 = NULL;
perftestInfo->latencyInfo->percentile9999 = NULL;
perftestInfo->latencyInfo->percentile999999 = NULL;
perftestInfo->latencyInfo->serializeTime = NULL;
perftestInfo->latencyInfo->deserializeTime = NULL;
perftestInfo->throughputInfo->packets = NULL;
perftestInfo->throughputInfo->packetsAverage = NULL;
perftestInfo->throughputInfo->mbps = NULL;
perftestInfo->throughputInfo->mbpsAverage = NULL;
perftestInfo->throughputInfo->lostPackets = NULL;
perftestInfo->throughputInfo->lostPacketsPercent = NULL;
perftestInfo->throughputInfo->packetsPerSecond = NULL;
}

void PerftestDDSPrinter::dataWrapperLatency(LatencyInfo latencyInfo)
{
if (this->_dataLength != perftestInfo->dataLength) {
perftestInfo->dataLength = _dataLength;
}

if (this->_showCPU) {
perftestInfo->outputCpu = &latencyInfo.outputCpu;
}
perftestInfo->latencyInfo->latency = &latencyInfo.latency;
perftestInfo->latencyInfo->average = &latencyInfo.average;
perftestInfo->latencyInfo->std = &latencyInfo.std;
perftestInfo->latencyInfo->minimum = &latencyInfo.minimum;
perftestInfo->latencyInfo->maximum = &latencyInfo.maximum;
// summary part
if (!latencyInfo.interval) {
perftestInfo->latencyInfo->percentile50 = &latencyInfo.percentile50;
perftestInfo->latencyInfo->percentile90 = &latencyInfo.percentile90;
perftestInfo->latencyInfo->percentile99 = &latencyInfo.percentile99;
perftestInfo->latencyInfo->percentile9999 = &latencyInfo.percentile9999;
perftestInfo->latencyInfo->percentile999999 = &latencyInfo.percentile999999;
if (_printSerialization) {
perftestInfo->latencyInfo->serializeTime = &latencyInfo.serializeTime;
perftestInfo->latencyInfo->deserializeTime = &latencyInfo.deserializeTime;
}
} else {
perftestInfo->latencyInfo->percentile50 = NULL;
perftestInfo->latencyInfo->percentile90 = NULL;
perftestInfo->latencyInfo->percentile99 = NULL;
perftestInfo->latencyInfo->percentile9999 = NULL;
perftestInfo->latencyInfo->percentile999999 = NULL;
perftestInfo->latencyInfo->serializeTime = NULL;
perftestInfo->latencyInfo->deserializeTime = NULL;
}
}

void PerftestDDSPrinter::dataWrapperThroughput(ThroughputInfo throughputInfo)
{
if (this->_dataLength != perftestInfo->dataLength) {
perftestInfo->dataLength = _dataLength;
}
if (this->_showCPU) {
perftestInfo->outputCpu = &throughputInfo.outputCpu;
}
perftestInfo->throughputInfo->packets = &throughputInfo.packets;
perftestInfo->throughputInfo->packetsAverage = &throughputInfo.packetsAverage;
perftestInfo->throughputInfo->mbps = &throughputInfo.mbps;
perftestInfo->throughputInfo->mbpsAverage = &throughputInfo.mbpsAve;
perftestInfo->throughputInfo->lostPackets = &throughputInfo.lostPackets;
perftestInfo->throughputInfo->lostPacketsPercent = &throughputInfo.lostPacketsPercent;
if (throughputInfo.interval) {
perftestInfo->throughputInfo->packetsPerSecond = &throughputInfo.packetsPerSecond;
} else {
perftestInfo->throughputInfo->packetsPerSecond = NULL;
}
}

/*
* This instantiation is to avoid a undefined reference of a templated static
* function of obtain_dds_de/serialize_time_costs.
Expand Down
Loading