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.

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

Fix/remove qos designated initializers #354

Merged
merged 4 commits into from
Feb 26, 2024
Merged

Fix/remove qos designated initializers #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5c702b
move z_n_qos_t related functions into .c (to hide designated initiali…
DenisBiryukov91 Feb 24, 2024
8e37ab8
z_sample_t docs update to include qos
DenisBiryukov91 Feb 24, 2024
cac8b3d
move qos functions back to header and remove usage of designated init…
DenisBiryukov91 Feb 24, 2024
54c291e
format
DenisBiryukov91 Feb 24, 2024
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
1 change: 1 addition & 0 deletions include/zenoh-pico/api/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ static inline z_qos_t z_qos_default(void) { return _Z_N_QOS_DEFAULT; }
* z_encoding_t encoding: The encoding of the value of this data sample.
* z_sample_kind_t kind: The kind of this data sample (PUT or DELETE).
* z_timestamp_t timestamp: The timestamp of this data sample.
* z_qos_t qos: Quality of service settings used to deliver this sample.
*/
typedef _z_sample_t z_sample_t;

Expand Down
3 changes: 2 additions & 1 deletion include/zenoh-pico/protocol/definitions/network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ typedef _z_qos_t _z_n_qos_t;

static inline _z_qos_t _z_n_qos_create(_Bool express, z_congestion_control_t congestion_control,
z_priority_t priority) {
_z_n_qos_t ret;
_Bool nodrop = congestion_control == Z_CONGESTION_CONTROL_DROP ? 0 : 1;
_z_n_qos_t ret = {._val = (uint8_t)((express << 4) | (nodrop << 3) | priority)};
ret._val = (uint8_t)((express << 4) | (nodrop << 3) | priority);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer the form

_z_n_qos_t ret = { uint8_t)((express << 4) | (nodrop << 3) | priority };

This would guarantee that all fields in _z_n_qos_t are set.
Though this variant works too.

return ret;
}
static inline z_priority_t _z_n_qos_get_priority(_z_n_qos_t n_qos) {
Expand Down
Loading