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

optimize by merging 3 unbuffered reads on IPC message header into one #57

Merged
merged 1 commit into from
Oct 19, 2024
+10 −12
Merged

optimize by merging 3 unbuffered reads on IPC message header into one #57

Show file tree
Hide file tree
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
11 changes: 5 additions & 6 deletions async/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ use swayipc_types::{Error::InvalidMagic, Fallible, MAGIC};
pub(super) async fn receive_from_stream(
stream: &mut Async<UnixStream>,
) -> Fallible<(u32, Vec<u8>)> {
let mut magic_data = [0_u8; 6];
stream.read_exact(&mut magic_data).await?;
let mut header_buf = [0_u8; 14];
stream.read_exact(&mut header_buf).await?;
let magic_data: [u8; 6] = header_buf[..6].try_into().unwrap();
if magic_data != MAGIC {
return Err(InvalidMagic(magic_data));
}
let mut payload_len_buf = [0_u8; 4];
stream.read_exact(&mut payload_len_buf).await?;
let payload_len_buf: [u8; 4] = header_buf[6..10].try_into().unwrap();
let payload_len = u32::from_ne_bytes(payload_len_buf);
let mut reply_type_buf = [0_u8; 4];
stream.read_exact(&mut reply_type_buf).await?;
let reply_type_buf: [u8; 4] = header_buf[10..14].try_into().unwrap();
let reply_type = u32::from_ne_bytes(reply_type_buf);
let mut reply_payload = vec![0_u8; payload_len as usize];
stream.read_exact(&mut reply_payload).await?;
Expand Down
11 changes: 5 additions & 6 deletions blocking/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ use std::os::unix::net::UnixStream;
use swayipc_types::{Error::InvalidMagic, Fallible, MAGIC};

pub(super) fn receive_from_stream(stream: &mut UnixStream) -> Fallible<(u32, Vec<u8>)> {
let mut magic_data = [0_u8; 6];
stream.read_exact(&mut magic_data)?;
let mut header_buf = [0_u8; 14];
stream.read_exact(&mut header_buf)?;
let magic_data: [u8; 6] = header_buf[..6].try_into().unwrap();
if magic_data != MAGIC {
return Err(InvalidMagic(magic_data));
}
let mut payload_len_buf = [0_u8; 4];
stream.read_exact(&mut payload_len_buf)?;
let payload_len_buf: [u8; 4] = header_buf[6..10].try_into().unwrap();
let payload_len = u32::from_ne_bytes(payload_len_buf);
let mut reply_type_buf = [0_u8; 4];
stream.read_exact(&mut reply_type_buf)?;
let reply_type_buf: [u8; 4] = header_buf[10..14].try_into().unwrap();
let reply_type = u32::from_ne_bytes(reply_type_buf);
let mut reply_payload = vec![0_u8; payload_len as usize];
stream.read_exact(&mut reply_payload)?;
Expand Down
Loading