Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Flip iter operations to keep associated address/header/packets together #22245

Merged
steviez merged 2 commits into from
Jan 3, 2022
Merged

Flip iter operations to keep associated address/header/packets together #22245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff507df
Flip iter operations to keep associated address/header/packets together
Jan 3, 2022
26923c5
Address feedback to use izip!()
Jan 3, 2022
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
17 changes: 8 additions & 9 deletions streamer/src/recvmmsg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,20 @@ pub fn recv_mmsg(sock: &UdpSocket, packets: &mut [Packet]) -> io::Result<(usize,
return Err(io::Error::last_os_error());
}
let mut npkts = 0;
addrs
.iter()
.zip(hdrs)
let mut total_size = 0;

izip!(addrs, hdrs, packets.iter_mut())
.take(nrecv as usize)
.filter_map(|(addr, hdr)| {
let addr = cast_socket_addr(addr, &hdr)?.to_std();
Some((addr, hdr))
.filter_map(|(addr, hdr, pkt)| {
let addr = cast_socket_addr(&addr, &hdr)?.to_std();
Some((addr, hdr, pkt))
})
.zip(packets.iter_mut())
.for_each(|((addr, hdr), pkt)| {
.for_each(|(addr, hdr, pkt)| {
pkt.meta.size = hdr.msg_len as usize;
pkt.meta.set_addr(&addr);
npkts += 1;
total_size += pkt.meta.size;
});
let total_size = packets.iter().take(npkts).map(|pkt| pkt.meta.size).sum();
Ok((total_size, npkts))
}

Expand Down