Skip to content
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

Refs #5020 Static data now allows different sizes between tests. [5029] #472

Merged
merged 4 commits into from
May 9, 2019
Merged

Refs #5020 Static data now allows different sizes between tests. [5029] #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9bad87
Refs #5020 Static data now allows different sizes between tests. Fix …
Apr 1, 2019
99e2e8c
Refs #5029 Requested changes.
Apr 17, 2019
25bc9cb
Refs #5029 Rebase fix
May 3, 2019
b447a70
Refs #5029 Requested changes
May 7, 2019
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
66 changes: 29 additions & 37 deletions test/performance/ThroughputPublisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,8 @@ ThroughputPublisher::ThroughputPublisher(bool reliable, uint32_t pid, bool hostn
return;
}

//REGISTER THE TYPES
if (dynamic_data)
{
Domain::registerType(mp_par, &m_DynType);
}
else
{
Domain::registerType(mp_par, (TopicDataType*)&latency_t);
}
//REGISTER THE COMMAND TYPE
latency_t = nullptr;
Domain::registerType(mp_par, (TopicDataType*)&throuputcommand_t);

// Create Sending Publisher
Expand Down Expand Up @@ -224,19 +217,17 @@ ThroughputPublisher::ThroughputPublisher(bool reliable, uint32_t pid, bool hostn

if (m_sXMLConfigFile.length() > 0)
{
mp_datapub = Domain::createPublisher(mp_par, profile_name, (PublisherListener*)&this->m_DataPubListener);
if (xmlparser::XMLP_ret::XML_ERROR
== xmlparser::XMLProfileManager::fillPublisherAttributes(profile_name, pubAttr))
{
std::cout << "Cannot read publisher profile " << profile_name << std::endl;
}
}
else
{
mp_datapub = Domain::createPublisher(mp_par, Wparam, (PublisherListener*)&this->m_DataPubListener);
}

if (mp_datapub == nullptr)
{
std::cout << "ERROR creating publisher" << std::endl;
ready = false;
return;
pubAttr = Wparam;
}
mp_datapub = nullptr;

// COMMAND SUBSCRIBER
SubscriberAttributes Rparam;
Expand Down Expand Up @@ -283,18 +274,10 @@ ThroughputPublisher::ThroughputPublisher(bool reliable, uint32_t pid, bool hostn
t_overhead_ = std::chrono::duration<double, std::micro>(t_end_ - t_start_) / 1001;
std::cout << "Overhead " << t_overhead_.count() << " us" << std::endl;

if (mp_datapub == nullptr || mp_commandsub == nullptr || mp_commandpub == nullptr)
if (mp_commandsub == nullptr || mp_commandpub == nullptr)
{
ready = false;
}

if (dynamic_data)
{
DynamicTypeBuilderFactory::delete_instance();
pubAttr = mp_datapub->getAttributes();
Domain::removePublisher(mp_datapub);
Domain::unregisterType(mp_par, "ThroughputType"); // Unregister as we will register it later with correct size
}
}

ThroughputPublisher::~ThroughputPublisher()
Expand Down Expand Up @@ -401,7 +384,7 @@ void ThroughputPublisher::run(uint32_t test_time, uint32_t recovery_time_ms, int
}
}

bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, uint32_t demand, uint32_t size)
bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, uint32_t demand, uint32_t msg_size)
{
if (dynamic_data)
{
Expand All @@ -412,7 +395,7 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
struct_type_builder->add_member(0, "seqnum", DynamicTypeBuilderFactory::get_instance()->create_uint32_type());
struct_type_builder->add_member(1, "data",
DynamicTypeBuilderFactory::get_instance()->create_sequence_builder(
DynamicTypeBuilderFactory::get_instance()->create_byte_type(), size
DynamicTypeBuilderFactory::get_instance()->create_byte_type(), msg_size
));
struct_type_builder->set_name("ThroughputType");

Expand All @@ -421,12 +404,12 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
m_DynType.SetDynamicType(m_pDynType);

Domain::registerType(mp_par, &m_DynType);
mp_datapub = Domain::createPublisher(mp_par, pubAttr, &m_DataPubListener);

m_DynData = DynamicDataFactory::get_instance()->create_data(m_pDynType);

MemberId id;
DynamicData *my_data = m_DynData->loan_value(m_DynData->get_member_id_at_index(1));
for (uint32_t i = 0; i < size; ++i)
for (uint32_t i = 0; i < msg_size; ++i)
{
my_data->insert_sequence_data(id);
my_data->set_byte_value(0, id);
Expand All @@ -435,8 +418,11 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
}
else
{
latency = new ThroughputType((uint16_t)size);
latency_t = new ThroughputDataType(msg_size);
Domain::registerType(mp_par, latency_t);
latency = new ThroughputType((uint16_t)msg_size);
}
mp_datapub = Domain::createPublisher(mp_par, pubAttr, &m_DataPubListener);

t_end_ = std::chrono::steady_clock::now();
std::chrono::duration<double, std::micro> timewait_us(0);
Expand Down Expand Up @@ -493,14 +479,19 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
{
DynamicTypeBuilderFactory::delete_instance();
DynamicDataFactory::get_instance()->delete_data(m_DynData);
pubAttr = mp_datapub->getAttributes();
Domain::removePublisher(mp_datapub);
Domain::unregisterType(mp_par, "ThroughputType");
}
else
{
delete(latency);
}
pubAttr = mp_datapub->getAttributes();
Domain::removePublisher(mp_datapub);
mp_datapub = nullptr;
Domain::unregisterType(mp_par, "ThroughputType");
if (!dynamic_data)
{
delete latency_t;
}

mp_commandsub->waitForUnreadMessage();
if (mp_commandsub->takeNextData((void*)&command, &info))
Expand All @@ -511,7 +502,7 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
//cout << "Received results from subscriber"<<endl;
TroughputResults result;
result.demand = demand;
result.payload_size = size + 4 + 4;
result.payload_size = msg_size + 4 + 4;
result.publisher.send_samples = samples;
result.publisher.totaltime_us = std::chrono::duration<double, std::micro>(t_end_ - t_start_) - timewait_us;
result.subscriber.recv_samples = command.m_lastrecsample - command.m_lostsamples;
Expand Down Expand Up @@ -542,7 +533,8 @@ bool ThroughputPublisher::test(uint32_t test_time, uint32_t recovery_time_ms, ui
"B_" + str_reliable + "_" + std::to_string(result.demand) + "demand.csv";
}
outFile.open(fileName);
outFile << "\"" << result.payload_size << " bytes; demand " << result.demand << " (" + str_reliable + ")\"" << std::endl;
outFile << "\"" << result.payload_size << " bytes; demand " << result.demand
<< " (" + str_reliable + ")\"" << std::endl;
outFile << "\"" << result.subscriber.MBitssec << "\"";
outFile.close();
}
Expand Down
4 changes: 2 additions & 2 deletions test/performance/ThroughputPublisher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ class ThroughputPublisher
bool dynamic_data = false;
int m_forced_domain;
// Static Data
ThroughputDataType latency_t;
ThroughputType *latency;
ThroughputDataType* latency_t;
ThroughputType* latency;
// Dynamic Data
eprosima::fastrtps::types::DynamicData* m_DynData;
eprosima::fastrtps::types::DynamicPubSubType m_DynType;
Expand Down
Loading