-
Notifications
You must be signed in to change notification settings - Fork 67
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
Support for ON_REQUESTED_INCOMPATIBLE_QOS and ON_OFFERED_INCOMPATIBLE_QOS events #193
Merged
ivanpauno
merged 11 commits into
ros2:master
from
aws-ros-dev:jaisontj/incompatible_qos
Mar 27, 2020
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
26b52c6
- Added new enum type RMW_EVENT_REQUESTED_INCOMPATIBLE_QOS and
jaisontj 4085097
Added last_policy_id to the new events
jaisontj 6987af8
Comments for newly created structures.
jaisontj 63b298c
Fixed code formatting issues.
jaisontj a4b6ca4
Fixed comment indentation.
jaisontj 6662afb
Added an enum representing the QosPolicyId_t from DDS
jaisontj 71cbdfe
address PR comments
mm318 0ae7095
remove extraneous enum
mm318 12b79c9
address PR comments
mm318 db521dd
fix compilation errors
mm318 a2da1cf
uncrustify
mm318 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#ifndef RMW__INCOMPATIBLE_QOS_EVENTS_STATUSES_H_ | ||
#define RMW__INCOMPATIBLE_QOS_EVENTS_STATUSES_H_ | ||
|
||
#include <stdint.h> | ||
|
||
#include "rmw/visibility_control.h" | ||
|
||
#ifdef __cplusplus | ||
extern "C" | ||
{ | ||
#endif | ||
|
||
/// QoS Policy Kinds | ||
typedef enum RMW_PUBLIC_TYPE rmw_qos_policy_kind_t | ||
{ | ||
RMW_QOS_POLICY_INVALID = 1 << 0, | ||
RMW_QOS_POLICY_DURABILITY = 1 << 1, | ||
RMW_QOS_POLICY_DEADLINE = 1 << 2, | ||
RMW_QOS_POLICY_LIVELINESS = 1 << 3, | ||
RMW_QOS_POLICY_RELIABILITY = 1 << 4, | ||
RMW_QOS_POLICY_HISTORY = 1 << 5, | ||
RMW_QOS_POLICY_LIFESPAN = 1 << 6 | ||
} rmw_qos_policy_kind_t; | ||
|
||
struct RMW_PUBLIC_TYPE rmw_qos_incompatible_event_status_t | ||
{ | ||
/** | ||
* Total cumulative number of times the concerned subscription discovered a | ||
* publisher for the same topic with an offered QoS that was incompatible | ||
* with that requested by the subscription. | ||
*/ | ||
int32_t total_count; | ||
/** | ||
* The change in total_count since the last time the status was read. | ||
*/ | ||
int32_t total_count_change; | ||
/** | ||
* The Qos Policy Kind of one of the policies that was found to be | ||
* incompatible the last time an incompatibility was detected. | ||
*/ | ||
rmw_qos_policy_kind_t last_policy_kind; | ||
}; | ||
|
||
/// Event state for a subscription's 'RMW_EVENT_REQUESTED_QOS_INCOMPATIBLE' events. | ||
typedef struct rmw_qos_incompatible_event_status_t rmw_requested_qos_incompatible_event_status_t; | ||
|
||
/// Event state for a publisher's 'RMW_EVENT_OFFERED_QOS_INCOMPATIBLE' events. | ||
typedef struct rmw_qos_incompatible_event_status_t rmw_offered_qos_incompatible_event_status_t; | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif // RMW__INCOMPATIBLE_QOS_EVENTS_STATUSES_H_ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since you've changed the enum to bitflags, is the intent to only return "one of the policies" or is it now intended to return a bitfield with "all of the policies" that were incompatible?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defining it as a bitflags opens up the possibility of returning multiple policies. However, currently the
rmw
implementations are still only capable of returning one policy.