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

Clean-up of protocol types #729

Merged
merged 33 commits into from
Feb 15, 2024
Merged

Clean-up of protocol types #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ad78933
Update Reply protocol definition and codec
Mallets Feb 2, 2024
305c732
Make consolidation a flag in Query/Reply
Mallets Feb 5, 2024
a6ce428
Fix wrong Consolidation cast in codec
Mallets Feb 5, 2024
c8df037
Apply Reply changes to routing
Mallets Feb 7, 2024
94de239
Fix shared-memory feature
Mallets Feb 7, 2024
acfc5d7
Fix stats
Mallets Feb 7, 2024
9c1598a
Bump Zenoh Protocol Version
Mallets Feb 7, 2024
198c715
Add query/reply ok(put|del)/err() tests
Mallets Feb 8, 2024
ba1c217
Merge branch 'main' into protocol_reply
Mallets Feb 8, 2024
09a97ac
Clean-up of code
Mallets Feb 9, 2024
32a2846
Default CongestionControl for Push is Drop
Mallets Feb 9, 2024
3c79d5e
Fix Priority::DEFAULT typo
Mallets Feb 9, 2024
89555f1
Define DEFAULT consts
Mallets Feb 9, 2024
d3da646
ConsolidationMode moved into the API
Mallets Feb 9, 2024
ab57ab0
Remove unused Ack message
Mallets Feb 9, 2024
a2a4c66
Fix Ack leftovers
Mallets Feb 9, 2024
9c35023
CongestionControl::DEFAULT
Mallets Feb 9, 2024
2e8f981
QoSType::DEFAULT
Mallets Feb 9, 2024
3adfc96
Mapping::DEFAULT
Mallets Feb 9, 2024
c5ca596
Encoding::DEFAULT
Mallets Feb 9, 2024
375fd01
QueryTarget::DEFAULT
Mallets Feb 9, 2024
665ef02
NodeType::DEFAULT
Mallets Feb 9, 2024
d93e933
QueryableInfo::DEFAULT
Mallets Feb 9, 2024
0c35fe8
Remove ConsolidationMode from zenoh-protocol
Mallets Feb 9, 2024
f19d7c9
ConsolidationType::DEFAULT
Mallets Feb 9, 2024
0e1bd9f
Remove dead code
Mallets Feb 12, 2024
1789825
Remove dead code
Mallets Feb 12, 2024
c664a78
Move SampleKind to sample.rs
Mallets Feb 12, 2024
dee4df0
Cleanup SubMode
Mallets Feb 12, 2024
227085d
Cleanup QueryTarget
Mallets Feb 12, 2024
fb16cf6
Remove emptyline
Mallets Feb 12, 2024
077d871
Merge with protocol_changes
Mallets Feb 12, 2024
82e9cc5
Merge with protocol_changes
Mallets Feb 13, 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
48 changes: 24 additions & 24 deletions commons/zenoh-codec/benches/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ fn criterion_benchmark(c: &mut Criterion) {
let codec = Zenoh080::new();

let frame = FrameHeader {
reliability: Reliability::default(),
reliability: Reliability::DEFAULT,
sn: TransportSn::MIN,
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::default(),
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand Down Expand Up @@ -121,19 +121,19 @@ fn criterion_benchmark(c: &mut Criterion) {
let codec = Zenoh080::new();

let frame = FrameHeader {
reliability: Reliability::default(),
reliability: Reliability::DEFAULT,
sn: TransportSn::MIN,
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::default(),
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand Down Expand Up @@ -162,19 +162,19 @@ fn criterion_benchmark(c: &mut Criterion) {
let codec = Zenoh080::new();

let frame = FrameHeader {
reliability: Reliability::default(),
reliability: Reliability::DEFAULT,
sn: TransportSn::MIN,
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::default(),
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand Down Expand Up @@ -210,12 +210,12 @@ fn criterion_benchmark(c: &mut Criterion) {

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand All @@ -238,12 +238,12 @@ fn criterion_benchmark(c: &mut Criterion) {

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand Down Expand Up @@ -277,12 +277,12 @@ fn criterion_benchmark(c: &mut Criterion) {

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::default(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::default(),
encoding: Encoding::DEFAULT,
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
Expand Down
1 change: 0 additions & 1 deletion commons/zenoh-codec/src/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
// ZettaScale Zenoh Team, <[email protected]>
//
pub mod extension;
mod priority;
66 changes: 0 additions & 66 deletions commons/zenoh-codec/src/common/priority.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion commons/zenoh-codec/src/core/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
//
mod encoding;
mod locator;
mod property;
#[cfg(feature = "shared-memory")]
mod shm;
mod timestamp;
Expand Down
84 changes: 0 additions & 84 deletions commons/zenoh-codec/src/core/property.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion commons/zenoh-codec/src/core/wire_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ where
Ok(WireExpr {
scope,
suffix: suffix.into(),
mapping: Mapping::default(),
mapping: Mapping::DEFAULT,
})
}
}
Loading