Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 19:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore timeout error in epoll_wait

Browse Source
This commit is contained in:
Yuke Peng
2024-07-16 14:50:10 +08:00
committed by Tate, Hongliang Tian
parent 07a0ea07c0
commit 0417ad7376
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/aster-nix/src/syscall/epoll.rs
View File

@ -109,9 +109,19 @@ fn do_epoll_wait(epfd: FileDesc, max_events: i32, timeout: i32) -> Result<Vec<Ep
.get_file(epfd)? .get_file(epfd)?
.downcast_ref::<EpollFile>() .downcast_ref::<EpollFile>()
.ok_or(Error::with_message(Errno::EINVAL, "not epoll file"))?; .ok_or(Error::with_message(Errno::EINVAL, "not epoll file"))?;
let epoll_events = epoll_file.wait(max_events, timeout.as_ref())?; let result = epoll_file.wait(max_events, timeout.as_ref());
Ok(epoll_events) // As mentioned in the manual, the return value should be zero if no file descriptor becomes ready
// during the requested `timeout` milliseconds. So we ignore `Err(ETIME)` and return an empty vector.
//
// Manual: <https://www.man7.org/linux/man-pages/man2/epoll_wait.2.html>
if result
.as_ref()
.is_err_and(|err| err.error() == Errno::ETIME)
{
return Ok(Vec::new());
}
result
} }
pub fn sys_epoll_wait( pub fn sys_epoll_wait(