Skip to content

pass callback argument by reference #1857

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

pass callback argument by reference #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e7007f
pass callback argument by reference
wyfo Mar 14, 2025
4ffcbd3
remove useless `From` impl
wyfo Apr 11, 2025
577597d
fix lint
wyfo Apr 16, 2025
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
126 changes: 27 additions & 99 deletions commons/zenoh-codec/benches/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ use zenoh_buffers::{
};
use zenoh_codec::*;
use zenoh_protocol::{
core::{Encoding, Reliability, WireExpr},
network::{ext, Push},
core::Reliability,
network::Push,
transport::{BatchSize, Frame, FrameHeader, TransportSn},
zenoh::{PushBody, Put},
zenoh::Put,
};

fn criterion_benchmark(c: &mut Criterion) {
Expand Down Expand Up @@ -80,22 +80,10 @@ fn criterion_benchmark(c: &mut Criterion) {
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 8]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 8]),
..Put::default()
});

// Calculate the number of messages
// let mut writer = buff.writer();
Expand Down Expand Up @@ -126,22 +114,10 @@ fn criterion_benchmark(c: &mut Criterion) {
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 8]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 8]),
..Put::default()
});

let mut writer = buff.writer();
codec.write(&mut writer, &frame).unwrap();
Expand All @@ -167,22 +143,10 @@ fn criterion_benchmark(c: &mut Criterion) {
ext_qos: zenoh_protocol::transport::frame::ext::QoSType::DEFAULT,
};

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 8]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 8]),
..Put::default()
});

let mut writer = buff.writer();
codec.write(&mut writer, &frame).unwrap();
Expand All @@ -208,22 +172,10 @@ fn criterion_benchmark(c: &mut Criterion) {
let mut buff = ZBuf::empty();
let codec = Zenoh080::new();

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 1_000_000]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 1_000_000]),
..Put::default()
});

c.bench_function("Fragmentation ZBuf Write", |b| {
b.iter(|| {
Expand All @@ -236,22 +188,10 @@ fn criterion_benchmark(c: &mut Criterion) {
let mut buff = vec![];
let codec = Zenoh080::new();

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 1_000_000]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 1_000_000]),
..Put::default()
});

let mut writer = buff.writer();
codec.write(&mut writer, &data).unwrap();
Expand All @@ -275,22 +215,10 @@ fn criterion_benchmark(c: &mut Criterion) {
let mut buff = vec![];
let codec = Zenoh080::new();

let data = Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 1_000_000]),
}),
};
let data = Push::from(Put {
payload: ZBuf::from(vec![0u8; 1_000_000]),
..Put::default()
});

let mut writer = buff.writer();
codec.write(&mut writer, &data).unwrap();
Expand Down
26 changes: 2 additions & 24 deletions commons/zenoh-protocol/src/network/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ impl fmt::Display for NetworkMessageMut<'_> {
}
}

#[cfg(feature = "test")]
impl From<NetworkBody> for NetworkMessage {
#[inline]
fn from(body: NetworkBody) -> Self {
Expand All @@ -378,36 +379,13 @@ impl From<NetworkBody> for NetworkMessage {
}
}

impl From<Declare> for NetworkMessage {
fn from(declare: Declare) -> Self {
NetworkBody::Declare(declare).into()
}
}

#[cfg(feature = "test")]
impl From<Push> for NetworkMessage {
fn from(push: Push) -> Self {
NetworkBody::Push(push).into()
}
}

impl From<Request> for NetworkMessage {
fn from(request: Request) -> Self {
NetworkBody::Request(request).into()
}
}

impl From<Response> for NetworkMessage {
fn from(response: Response) -> Self {
NetworkBody::Response(response).into()
}
}

impl From<ResponseFinal> for NetworkMessage {
fn from(final_response: ResponseFinal) -> Self {
NetworkBody::ResponseFinal(final_response).into()
}
}

// Extensions
pub mod ext {
use core::fmt;
Expand Down
32 changes: 32 additions & 0 deletions commons/zenoh-protocol/src/network/push.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
// Contributors:
// ZettaScale Zenoh Team, <[email protected]>
//
#[cfg(test)]
use crate::zenoh::Put;
use crate::{core::WireExpr, zenoh::PushBody};

pub mod flag {
Expand Down Expand Up @@ -84,3 +86,33 @@ impl Push {
}
}
}

#[cfg(feature = "test")]
impl From<PushBody> for Push {
fn from(value: PushBody) -> Self {
Self {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::DEFAULT,
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: value,
}
}
}

#[cfg(feature = "test")]
impl From<Put> for Push {
fn from(value: Put) -> Self {
PushBody::from(value).into()
}
}

#[cfg(feature = "test")]
impl From<Vec<u8>> for Push {
fn from(value: Vec<u8>) -> Self {
Self::from(Put {
payload: value.into(),
..Put::default()
})
}
}
2 changes: 1 addition & 1 deletion commons/zenoh-protocol/src/zenoh/del.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub mod flag {
pub const Z: u8 = 1 << 7; // 0x80 Extensions if Z==1 then an extension will follow
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct Del {
pub timestamp: Option<Timestamp>,
pub ext_sinfo: Option<ext::SourceInfoType>,
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-protocol/src/zenoh/put.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub mod flag {
pub const Z: u8 = 1 << 7; // 0x80 Extensions if Z==1 then an extension will follow
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct Put {
pub timestamp: Option<Timestamp>,
pub encoding: Encoding,
Expand Down
22 changes: 4 additions & 18 deletions io/zenoh-transport/src/common/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,16 +532,14 @@ mod tests {
use std::vec;

use rand::Rng;
use zenoh_buffers::ZBuf;
use zenoh_core::zcondfeat;
use zenoh_protocol::{
core::{CongestionControl, Encoding, Priority, Reliability, WireExpr},
core::{CongestionControl, Priority, Reliability, WireExpr},
network::{ext, NetworkMessage, NetworkMessageExt, Push},
transport::{
frame::{self, FrameHeader},
Fragment, KeepAlive, TransportMessage,
},
zenoh::{PushBody, Put},
};

use super::*;
Expand Down Expand Up @@ -607,23 +605,11 @@ mod tests {
let mut batch = WBatch::new(config);

let tmsg: TransportMessage = KeepAlive.into();
let mut nmsg: NetworkMessage = Push {
let mut nmsg = NetworkMessage::from(Push {
wire_expr: WireExpr::empty(),
ext_qos: ext::QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::DEFAULT,
payload: PushBody::Put(Put {
timestamp: None,
encoding: Encoding::empty(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
ext_shm: None,
ext_attachment: None,
ext_unknown: vec![],
payload: ZBuf::from(vec![0u8; 8]),
}),
}
.into();
..Push::from(vec![0u8; 8])
});

let mut tmsgs_in = vec![];
let mut nmsgs_in = vec![];
Expand Down
Loading
Loading