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

fix: preadv2 only available on GNU libc #80

Merged
merged 1 commit into from
Apr 12, 2024
Merged

fix: preadv2 only available on GNU libc #80

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: 8 additions & 3 deletions src/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,10 @@ impl Client {

// On Linux, we can use preadv2 to do non-blocking read,
// even if `O_NONBLOCK` is not set.
#[cfg(target_os = "linux")]
//
// TODO: musl libc supports preadv2 since 1.2.5, but `libc` crate
// hasn't yet added it.
#[cfg(all(target_os = "linux", target_env = "gnu"))]
{
let read = self.read().as_raw_fd();
loop {
Expand Down Expand Up @@ -577,7 +580,9 @@ extern "C" fn sigusr1_handler(
// nothing to do
}

#[cfg(target_os = "linux")]
// This should be available for all linux targets,
// though only [`non_blocking_read`] currently uses it so adding gnu cfg.
#[cfg(all(target_os = "linux", target_env = "gnu"))]
fn cvt_ssize(t: libc::ssize_t) -> io::Result<libc::ssize_t> {
if t == -1 {
Err(io::Error::last_os_error())
Expand All @@ -586,7 +591,7 @@ fn cvt_ssize(t: libc::ssize_t) -> io::Result<libc::ssize_t> {
}
}

#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", target_env = "gnu"))]
fn non_blocking_read(fd: c_int, buf: &mut [u8]) -> io::Result<usize> {
static IS_NONBLOCKING_READ_UNSUPPORTED: AtomicBool = AtomicBool::new(false);

Expand Down