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

Jump to bottom

guard against unnecessary blocking read if there is no payload #322

Merged
merged 1 commit into from
May 31, 2024
Merged

guard against unnecessary blocking read if there is no payload #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions daemon/src/wayland/wire.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,19 @@ impl WireMsg {

let mut payload = vec![0u32; size >> 2];

// this should not fail with INTR, because otherwise our socket's internal buffer will
// be left in an inconsistent state (a message without a header)
rustix::io::retry_on_intr(|| {
let iov = io::IoSliceMut::new(u32_slice_to_u8_mut(&mut payload));
net::recvmsg(
wayland_fd(),
&mut [iov],
&mut control,
net::RecvFlags::WAITALL,
)
})?;
if size > 0 {
// this should not fail with INTR, because otherwise our socket's internal buffer will
// be left in an inconsistent state (a message without a header)
rustix::io::retry_on_intr(|| {
let iov = io::IoSliceMut::new(u32_slice_to_u8_mut(&mut payload));
net::recvmsg(
wayland_fd(),
&mut [iov],
&mut control,
net::RecvFlags::WAITALL,
)
})?;
}

Ok((
Self {
Expand Down
Loading