Skip to content

use string comparison to implementation_identifier, not by addresses. #3073

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

Closed
fujitatomoya wants to merge 1 commit into from
+7 −2
Closed

use string comparison to implementation_identifier, not by addresses. #3073

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
9 changes: 7 additions & 2 deletions rclcpp/include/rclcpp/experimental/intra_process_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include <shared_mutex>

#include <cstring>
#include <iterator>
#include <memory>
#include <stdexcept>
Expand Down Expand Up @@ -408,8 +409,12 @@ class IntraProcessManager
{
bool operator()(const rmw_gid_t & lhs, const rmw_gid_t & rhs) const noexcept
{
// Compare implementation identifier first for fast rejection
if (lhs.implementation_identifier != rhs.implementation_identifier) {
// Compare implementation identifier string content first for fast rejection
if (lhs.implementation_identifier == nullptr || rhs.implementation_identifier == nullptr) {
return lhs.implementation_identifier == rhs.implementation_identifier &&
std::equal(std::begin(lhs.data), std::end(lhs.data), std::begin(rhs.data));
}
if (std::strcmp(lhs.implementation_identifier, rhs.implementation_identifier) != 0) {
return false;
}
// Compare the data bytes
Expand Down