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.

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

[rmw_connextdds] New RMW discovery options #108

Merged
merged 27 commits into from
Apr 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e59a43d
Use the new discovery params
mxgrey Mar 8, 2023
43002e6
Update to latest rmw API
mxgrey Mar 9, 2023
e2ff364
Fix typo
mxgrey Mar 9, 2023
4738aba
Fix memory management
mxgrey Mar 10, 2023
d550c7d
Merge branch 'rolling' into discovery-peers-specification
sloretz Mar 24, 2023
dedf94b
Make sure NDDS_DISCOVERY_PEERS is not empty when ROS_AUTOMATIC_DISCOV…
asorbini Mar 30, 2023
5ae99e9
fix up finalize logic
wjwwood Mar 30, 2023
77768a8
typo
wjwwood Mar 30, 2023
2d52d8f
check the return code of ensure_length()
wjwwood Mar 30, 2023
9aef6d1
fixup use of memcpy when copying a string
wjwwood Mar 30, 2023
a492c17
improve formatting of domain_tag string
wjwwood Mar 30, 2023
43e6382
use c++17 [[fallthrough]] attribute
wjwwood Mar 30, 2023
b4c9e9c
change style of switch statement
wjwwood Mar 30, 2023
2d32141
undo change to request c++17 vs 14 since we're not using fallthrough
wjwwood Mar 30, 2023
d5c59dc
Handle all discovery options in rmw_context.cpp
asorbini Mar 31, 2023
cf370ca
Reset multicast_receive_addresses instead of setting NDDS_DISCOVERY_P…
asorbini Mar 31, 2023
84238ad
error when range is NOT_SET
wjwwood Mar 31, 2023
84db854
fixup review comments
wjwwood Mar 31, 2023
4bafd73
fix a zero initialization issue
wjwwood Mar 31, 2023
e3a5c8f
remove redundant break statement
wjwwood Mar 31, 2023
8a4fbfd
Init discovery_options when initializing node options
sloretz Apr 1, 2023
5c56565
Set maximum participant ID to 32 on localhost
sloretz Apr 4, 2023
c501a76
Skipping adding peers when automatic_discovery_range is SYSTEM_DEFAULT
sloretz Apr 4, 2023
b74dda7
Merge branch 'rolling' into discovery-peers-specification
sloretz Apr 5, 2023
a054497
Try solving los of precision warning on Windows
sloretz Apr 6, 2023
ef89f78
Fix windows warning
sloretz Apr 7, 2023
429b63d
Merge branch 'rolling' into discovery-peers-specification
sloretz Apr 7, 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
17 changes: 10 additions & 7 deletions rmw_connextdds_common/include/rmw_connextdds/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <mutex>
#include <regex>
#include <string>
#include <memory>

#include "rmw_connextdds/dds_api.hpp"
#include "rmw_connextdds/log.hpp"
Expand Down Expand Up @@ -78,8 +79,11 @@ struct rmw_context_impl_s
DDS_DataReader * dr_publications;
DDS_DataReader * dr_subscriptions;

/* Keep track of whether the DomainParticipant is localhost only */
bool localhost_only;
/* Keep track of what discovery settings were used when initializing */
rmw_discovery_options_t * discovery_options;

/* Manage the memory of the domain tag */
char * domain_tag;

/* Global configuration for QoS profiles */
std::string qos_ctx_name;
Expand Down Expand Up @@ -160,7 +164,8 @@ struct rmw_context_impl_s
dr_participants(nullptr),
dr_publications(nullptr),
dr_subscriptions(nullptr),
localhost_only(base->options.localhost_only == RMW_LOCALHOST_ONLY_ENABLED)
discovery_options(nullptr),
domain_tag(nullptr)
{
/* destructor relies on these being initialized properly */
common.thread_is_running.store(false);
Expand All @@ -180,17 +185,15 @@ struct rmw_context_impl_s
// node_count is increased
rmw_ret_t
initialize_node(
const char * const node_name,
const char * const node_namespace,
const bool localhost_only);
const rmw_discovery_options_t * const discovery_options);

// Destroys the participant, when node_count reaches 0.
rmw_ret_t
finalize_node();

// Initialize the DomainParticipant associated with the context.
rmw_ret_t
initialize_participant(const bool localhost_only);
initialize_participant();

// Enable the DomainParticipant associated with the context.
rmw_ret_t
Expand Down
Loading