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.

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

improve compatibility to the BSD socket layer #1085

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/fd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,17 @@ async fn poll_fds(fds: &mut [PollFd]) -> Result<u64, IoError> {
/// monitored is specified in the `fds` argument, which is an array
/// of structs of `PollFd`.
pub fn poll(fds: &mut [PollFd], timeout: Option<Duration>) -> Result<u64, IoError> {
block_on(poll_fds(fds), timeout)
let result = block_on(poll_fds(fds), timeout);
if let Err(ref e) = result {
if timeout.is_some() {
// A return value of zero indicates that the system call timed out
if *e == IoError::EAGAIN {
return Ok(0);
}
}
}

result
}

/// `eventfd` creates an linux-like "eventfd object" that can be used
Expand Down