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

Jump to bottom

Coverity fixes #454

Merged
merged 4 commits into from
Sep 27, 2023
Merged

Coverity fixes #454

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
d434a88
Fixes for coverity issue fun_call_w_exception
reicheratwork Sep 27, 2023
48e662f
Fix for coverity issue copy_constructor_call
reicheratwork Sep 27, 2023
139c10d
Fix for coverity issue dead_error_line
reicheratwork Sep 27, 2023
9b9e2b8
Fix for coverity issue dead_error_line in max functions
reicheratwork Sep 27, 2023
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
163 changes: 87 additions & 76 deletions examples/roundtrip/ping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,103 +210,114 @@ static bool parse_args(int argc, char *argv[])

int main (int argc, char *argv[])
{
/* Register handler for Ctrl-C */
signal (SIGINT, sigint);
try {
/* Register handler for Ctrl-C */
signal (SIGINT, sigint);

if (!parse_args(argc, argv)) {
print_usage();
return EXIT_FAILURE;
}
if (!parse_args(argc, argv)) {
print_usage();
return EXIT_FAILURE;
}

dds::domain::DomainParticipant participant(domain::default_id());
dds::domain::DomainParticipant participant(domain::default_id());

dds::topic::qos::TopicQos tqos;
tqos << dds::core::policy::Reliability::Reliable(dds::core::Duration::from_secs(10));
dds::topic::qos::TopicQos tqos;
tqos << dds::core::policy::Reliability::Reliable(dds::core::Duration::from_secs(10));

dds::topic::Topic<RoundTripModule::DataType> topic(participant, "RoundTrip", tqos);
dds::topic::Topic<RoundTripModule::DataType> topic(participant, "RoundTrip", tqos);

dds::pub::qos::PublisherQos pqos;
pqos << dds::core::policy::Partition("ping");
dds::pub::qos::PublisherQos pqos;
pqos << dds::core::policy::Partition("ping");

dds::pub::Publisher publisher(participant, pqos);
dds::pub::Publisher publisher(participant, pqos);

dds::pub::qos::DataWriterQos wqos;
wqos << dds::core::policy::WriterDataLifecycle::ManuallyDisposeUnregisteredInstances();
dds::pub::qos::DataWriterQos wqos;
wqos << dds::core::policy::WriterDataLifecycle::ManuallyDisposeUnregisteredInstances();

dds::pub::DataWriter<RoundTripModule::DataType> writer(publisher, topic, wqos);
dds::pub::DataWriter<RoundTripModule::DataType> writer(publisher, topic, wqos);

dds::sub::qos::SubscriberQos sqos;
sqos << dds::core::policy::Partition("pong");
dds::sub::qos::SubscriberQos sqos;
sqos << dds::core::policy::Partition("pong");

dds::sub::Subscriber subscriber(participant, sqos);
dds::sub::Subscriber subscriber(participant, sqos);

RoundTripListener listener(writer, &data_available);
RoundTripListener listener(writer, &data_available);

RoundTripListener *list = use_listener ? &listener : nullptr;
dds::sub::DataReader<RoundTripModule::DataType>
reader(
subscriber,
topic,
dds::sub::qos::DataReaderQos(),
list,
use_listener ? dds::core::status::StatusMask::data_available() : dds::core::status::StatusMask::none());
RoundTripListener *list = use_listener ? &listener : nullptr;
dds::sub::DataReader<RoundTripModule::DataType>
reader(
subscriber,
topic,
dds::sub::qos::DataReaderQos(),
list,
use_listener ? dds::core::status::StatusMask::data_available() : dds::core::status::StatusMask::none());

dds::core::Duration waittime = timeOut ?
dds::core::Duration::from_secs(static_cast<double>(timeOut)) :
dds::core::Duration::infinite();
if (!match_readers_and_writers(reader, writer, waittime)) {
return EXIT_FAILURE;
}
dds::core::Duration waittime = timeOut ?
dds::core::Duration::from_secs(static_cast<double>(timeOut)) :
dds::core::Duration::infinite();
if (!match_readers_and_writers(reader, writer, waittime)) {
return EXIT_FAILURE;
}

roundtrip_msg.payload(std::vector<uint8_t>(payloadSize, 'a'));
roundtrip_msg.payload(std::vector<uint8_t>(payloadSize, 'a'));

startTime = dds_time ();
preWriteTime = dds_time ();
startTime = dds_time ();
preWriteTime = dds_time ();

//starting write
writer.write(roundtrip_msg);
if (sendTerm) {
std::cout << "# Sending termination command to pong program\n" << std::flush;
writer.dispose_instance(roundtrip_msg);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
return EXIT_FAILURE;
}

printf ("# Waiting for startup jitter to stabilise\n");
if (use_listener) {
while (!timedOut && !done && (!numSamples || elapsed < numSamples)) {
timedOut = (timeOut != 0);
std::this_thread::sleep_for(std::chrono::seconds(timeOut ? timeOut : 1));
//starting write
writer.write(roundtrip_msg);
if (sendTerm) {
std::cout << "# Sending termination command to pong program\n" << std::flush;
writer.dispose_instance(roundtrip_msg);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
return EXIT_FAILURE;
}
} else {
dds::core::cond::WaitSet waitset;

dds::core::cond::StatusCondition rsc(reader);
rsc.enabled_statuses(dds::core::status::StatusMask::data_available());
waitset.attach_condition(rsc);

while (!timedOut && !done && (!numSamples || elapsed < numSamples)) {
try {
waitset.wait(waittime);
} catch (const dds::core::TimeoutError &) {
std::cout << "\n# Timeout occurred.\n" << std::flush;
timedOut = true;
break;
} catch (const dds::core::Exception &e) {
std::cout << "\n# Ping encountered the following error: \"" << e.what() << "\".\n" << std::flush;

printf ("# Waiting for startup jitter to stabilise\n");
if (use_listener) {
while (!timedOut && !done && (!numSamples || elapsed < numSamples)) {
timedOut = (timeOut != 0);
std::this_thread::sleep_for(std::chrono::seconds(timeOut ? timeOut : 1));
}
} else {
dds::core::cond::WaitSet waitset;

dds::core::cond::StatusCondition rsc(reader);
rsc.enabled_statuses(dds::core::status::StatusMask::data_available());
waitset.attach_condition(rsc);

while (!timedOut && !done && (!numSamples || elapsed < numSamples)) {
try {
waitset.wait(waittime);
} catch (const dds::core::TimeoutError &) {
std::cout << "\n# Timeout occurred.\n" << std::flush;
timedOut = true;
break;
} catch (const dds::core::Exception &e) {
std::cout << "\n# Ping encountered the following error: \"" << e.what() << "\".\n" << std::flush;
done = true;
} catch (...) {
std::cout << "\n# Ping encountered an error.\n" << std::flush;
done = true;
} catch (...) {
std::cout << "\n# Ping encountered an error.\n" << std::flush;
done = true;
}
(void) data_available(reader, writer);
}
(void) data_available(reader, writer);
}
}

if (!warmUp)
{
std::cout << "# Overall" << std::flush;
print_all(roundTripOverall, writeAccessOverall, readAccessOverall);
if (!warmUp)
{
std::cout << "# Overall" << std::flush;
print_all(roundTripOverall, writeAccessOverall, readAccessOverall);
}
} catch (const dds::core::Exception& e) {
std::cerr << "# DDS exception: " << e.what() << std::endl;
return EXIT_FAILURE;
} catch (const std::exception& e) {
std::cerr << "# C++ exception: " << e.what() << std::endl;
return EXIT_FAILURE;
} catch (...) {
std::cerr << "# Generic exception" << std::endl;
return EXIT_FAILURE;
}

return EXIT_SUCCESS;
Expand Down
125 changes: 68 additions & 57 deletions examples/roundtrip/pong.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,79 +93,90 @@ static bool data_available(dds::sub::DataReader<RoundTripModule::DataType>& rd,

int main (int argc, char *argv[])
{
signal (SIGINT, sigint);
try {
signal (SIGINT, sigint);

if (!parse_args(argc, argv)) {
print_usage();
return EXIT_SUCCESS;
}
if (!parse_args(argc, argv)) {
print_usage();
return EXIT_SUCCESS;
}

dds::domain::DomainParticipant participant(domain::default_id());
dds::domain::DomainParticipant participant(domain::default_id());

dds::topic::qos::TopicQos tqos;
tqos << dds::core::policy::Reliability::Reliable(dds::core::Duration::from_secs(10));
dds::topic::qos::TopicQos tqos;
tqos << dds::core::policy::Reliability::Reliable(dds::core::Duration::from_secs(10));

dds::topic::Topic<RoundTripModule::DataType> topic(participant, "RoundTrip", tqos);
dds::topic::Topic<RoundTripModule::DataType> topic(participant, "RoundTrip", tqos);

dds::pub::qos::PublisherQos pqos;
pqos << dds::core::policy::Partition("pong");
dds::pub::qos::PublisherQos pqos;
pqos << dds::core::policy::Partition("pong");

dds::pub::Publisher publisher(participant, pqos);
dds::pub::Publisher publisher(participant, pqos);

dds::pub::qos::DataWriterQos wqos;
wqos << dds::core::policy::WriterDataLifecycle::ManuallyDisposeUnregisteredInstances();
dds::pub::qos::DataWriterQos wqos;
wqos << dds::core::policy::WriterDataLifecycle::ManuallyDisposeUnregisteredInstances();

dds::pub::DataWriter<RoundTripModule::DataType> writer(publisher, topic, wqos);
dds::pub::DataWriter<RoundTripModule::DataType> writer(publisher, topic, wqos);

dds::sub::qos::SubscriberQos sqos;
sqos << dds::core::policy::Partition("ping");
dds::sub::qos::SubscriberQos sqos;
sqos << dds::core::policy::Partition("ping");

dds::sub::Subscriber subscriber(participant, sqos);
dds::sub::Subscriber subscriber(participant, sqos);

RoundTripListener listener(writer, &data_available);
RoundTripListener listener(writer, &data_available);

RoundTripListener *list = use_listener ? &listener : nullptr;
dds::sub::DataReader<RoundTripModule::DataType>
reader(
subscriber,
topic,
dds::sub::qos::DataReaderQos(),
list,
use_listener ? dds::core::status::StatusMask::data_available() : dds::core::status::StatusMask::none());
RoundTripListener *list = use_listener ? &listener : nullptr;
dds::sub::DataReader<RoundTripModule::DataType>
reader(
subscriber,
topic,
dds::sub::qos::DataReaderQos(),
list,
use_listener ? dds::core::status::StatusMask::data_available() : dds::core::status::StatusMask::none());

dds::core::Duration waittime = timeOut ?
dds::core::Duration::from_secs(static_cast<double>(timeOut)) :
dds::core::Duration::infinite();
if (!match_readers_and_writers(reader, writer, waittime))
return EXIT_FAILURE;
dds::core::Duration waittime = timeOut ?
dds::core::Duration::from_secs(static_cast<double>(timeOut)) :
dds::core::Duration::infinite();
if (!match_readers_and_writers(reader, writer, waittime))
return EXIT_FAILURE;

if (use_listener) {
while (!timedOut && !done) {
timedOut = (timeOut != 0);
std::this_thread::sleep_for(std::chrono::seconds(timeOut ? timeOut : 1));
}
} else {
dds::core::cond::WaitSet waitset;

dds::core::cond::StatusCondition rsc(reader);
rsc.enabled_statuses(dds::core::status::StatusMask::data_available());
waitset.attach_condition(rsc);

while (!timedOut && !done) {
try {
waitset.wait(waittime);
} catch (const dds::core::TimeoutError &) {
std::cout << "\n# Timeout occurred.\n" << std::flush;
return EXIT_FAILURE;
} catch (const dds::core::Exception &e) {
std::cout << "\n# Pong encountered the following error: \"" << e.what() << "\".\n" << std::flush;
return EXIT_FAILURE;
} catch (...) {
std::cout << "\n# Pong encountered an error.\n" << std::flush;
return EXIT_FAILURE;
if (use_listener) {
while (!timedOut && !done) {
timedOut = (timeOut != 0);
std::this_thread::sleep_for(std::chrono::seconds(timeOut ? timeOut : 1));
}
} else {
dds::core::cond::WaitSet waitset;

dds::core::cond::StatusCondition rsc(reader);
rsc.enabled_statuses(dds::core::status::StatusMask::data_available());
waitset.attach_condition(rsc);

while (!timedOut && !done) {
try {
waitset.wait(waittime);
} catch (const dds::core::TimeoutError &) {
std::cout << "\n# Timeout occurred.\n" << std::flush;
return EXIT_FAILURE;
} catch (const dds::core::Exception &e) {
std::cout << "\n# Pong encountered the following error: \"" << e.what() << "\".\n" << std::flush;
return EXIT_FAILURE;
} catch (...) {
std::cout << "\n# Pong encountered an error.\n" << std::flush;
return EXIT_FAILURE;
}
(void) data_available(reader, writer);
}
(void) data_available(reader, writer);
}
} catch (const dds::core::Exception& e) {
std::cerr << "# DDS exception: " << e.what() << std::endl;
return EXIT_FAILURE;
} catch (const std::exception& e) {
std::cerr << "# C++ exception: " << e.what() << std::endl;
return EXIT_FAILURE;
} catch (...) {
std::cerr << "# Generic exception" << std::endl;
return EXIT_FAILURE;
}

return EXIT_SUCCESS;
Expand Down
Loading
Loading