Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 02:36:37 +08:00
Code Issues Actions 32 Packages Projects Releases Wiki Activity

microRTPS: use char-by-char comparison instead of stringstream comparison

Browse Source
This commit is contained in:
TSC21
2020-03-05 12:56:44 +00:00
committed by Nuno Marques
parent 80c658c1ae
commit db7d98c16f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/templates/urtps/Publisher.cpp.em
+6 -4
View File
@@ -129,14 +129,16 @@ void @(topic)_Publisher::PubListener::onPublicationMatched(Publisher* pub, Match
{ {
// The first 6 values of the ID guidPrefix of an entity in a DDS-RTPS Domain // The first 6 values of the ID guidPrefix of an entity in a DDS-RTPS Domain
// are the same for all its subcomponents (publishers, subscribers) // are the same for all its subcomponents (publishers, subscribers)
std::stringstream own_endpoint, remote_endpoint; bool is_different_endpoint = false;
for (size_t i = 0; i < 6; i++) { for (size_t i = 0; i < 6; i++) {
own_endpoint << pub->getGuid().guidPrefix.value[i]; if (pub->getGuid().guidPrefix.value[i] != info.remoteEndpointGuid.guidPrefix.value[i]) {
remote_endpoint << info.remoteEndpointGuid.guidPrefix.value[i]; is_different_endpoint = true;
break;
}
} }
// If the matching happens for the same entity, do not make a match // If the matching happens for the same entity, do not make a match
if (own_endpoint.str() != remote_endpoint.str()) { if (is_different_endpoint) {
if (info.status == MATCHED_MATCHING) if (info.status == MATCHED_MATCHING)
{ {
n_matched++; n_matched++;
msg/templates/urtps/Subscriber.cpp.em
+6 -4
View File
@@ -129,14 +129,16 @@ void @(topic)_Subscriber::SubListener::onSubscriptionMatched(Subscriber* sub, Ma
{ {
// The first 6 values of the ID guidPrefix of an entity in a DDS-RTPS Domain // The first 6 values of the ID guidPrefix of an entity in a DDS-RTPS Domain
// are the same for all its subcomponents (publishers, subscribers) // are the same for all its subcomponents (publishers, subscribers)
std::stringstream own_endpoint, remote_endpoint; bool is_different_endpoint = false;
for (size_t i = 0; i < 6; i++) { for (size_t i = 0; i < 6; i++) {
own_endpoint << sub->getGuid().guidPrefix.value[i]; if (sub->getGuid().guidPrefix.value[i] != info.remoteEndpointGuid.guidPrefix.value[i]) {
remote_endpoint << info.remoteEndpointGuid.guidPrefix.value[i]; is_different_endpoint = true;
break;
}
} }
// If the matching happens for the same entity, do not make a match // If the matching happens for the same entity, do not make a match
if (own_endpoint.str() != remote_endpoint.str()) { if (is_different_endpoint) {
if (info.status == MATCHED_MATCHING) if (info.status == MATCHED_MATCHING)
{ {
n_matched++; n_matched++;