Skip to content

Always modify UserObjectQosPolicy regardless of override policy #53

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

Merged
asorbini merged 1 commit into from
Apr 28, 2021
Merged

Always modify UserObjectQosPolicy regardless of override policy #53

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
32 changes: 18 additions & 14 deletions rmw_connextdds_common/src/ndds/dds_api_ndds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,24 @@ rmw_connextdds_initialize_participant_qos_impl(
rmw_context_impl_t * const ctx,
DDS_DomainParticipantQos * const dp_qos)
{
#if RMW_CONNEXT_SHARE_DDS_ENTITIES_WITH_CPP
// UserObjectQosPolicy is an internal, undocumented Connext policy used by the
// implementations of different language bindings to control the memory
// representations of various objects created by user applications. In this
// case, the settings match the requirements of the "modern C++" API, and they
// allow the DomainParticipant to be used directly by applications that want
// to create new entities in C++11, even though the participant was created
// using the C API. If these settings are not specified, an application will
// receive a SIGSEGV when trying to create one of these entities.
//
// The customizations are always applied regardless of the QoS override policy
// because UserObjectQosPolicy cannot be modified from XML.
//
dp_qos->user_object.flow_controller_user_object.size = sizeof(void *);
dp_qos->user_object.topic_user_object.size = sizeof(void *);
dp_qos->user_object.content_filtered_topic_user_object.size = sizeof(void *);
#endif /* RMW_CONNEXT_SHARE_DDS_ENTITIES_WITH_CPP */

switch (ctx->participant_qos_override_policy) {
case rmw_context_impl_t::participant_qos_override_policy_t::All:
case rmw_context_impl_t::participant_qos_override_policy_t::Basic:
Expand Down Expand Up @@ -208,20 +226,6 @@ rmw_connextdds_initialize_participant_qos_impl(
}
#endif /* RMW_CONNEXT_FAST_ENDPOINT_DISCOVERY */

#if RMW_CONNEXT_SHARE_DDS_ENTITIES_WITH_CPP
// UserObjectQosPolicy is an internal, undocumented Connext policy used by the
// implementations of different language bindings to control the memory
// representations of various objects created by user applications. In this
// case, the settings match the requirements of the "modern C++" API, and they
// allow the DomainParticipant to be used directly by applications that want
// to create new entities in C++11, even though the participant was created
// using the C API. If these settings are not specified, an application will
// receive a SIGSEGV when trying to create one of these entities.
dp_qos->user_object.flow_controller_user_object.size = sizeof(void *);
dp_qos->user_object.topic_user_object.size = sizeof(void *);
dp_qos->user_object.content_filtered_topic_user_object.size = sizeof(void *);
#endif /* RMW_CONNEXT_SHARE_DDS_ENTITIES_WITH_CPP */

return RMW_RET_OK;
}

Expand Down