Skip to content
Snippets Groups Projects
Verified Commit d2cb0959 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix redox epoll timeout

parent 6a9d0701
No related branches found
No related tags found
No related merge requests found
...@@ -68,15 +68,6 @@ impl PalEpoll for Sys { ...@@ -68,15 +68,6 @@ impl PalEpoll for Sys {
match File::open(c_str!("time:4"), O_RDWR) { match File::open(c_str!("time:4"), O_RDWR) {
Err(_) => return -1, Err(_) => return -1,
Ok(mut timer) => { Ok(mut timer) => {
let mut time = TimeSpec::default();
if let Err(err) = timer.read(&mut time) {
return -1;
}
time.tv_nsec += timeout;
if let Err(err) = timer.write(&time) {
return -1;
}
if Sys::write( if Sys::write(
epfd, epfd,
&Event { &Event {
...@@ -89,6 +80,16 @@ impl PalEpoll for Sys { ...@@ -89,6 +80,16 @@ impl PalEpoll for Sys {
return -1; return -1;
} }
let mut time = TimeSpec::default();
if let Err(err) = timer.read(&mut time) {
return -1;
}
time.tv_sec += (timeout as i64) / 1000;
time.tv_nsec += (timeout % 1000) * 1000000;
if let Err(err) = timer.write(&time) {
return -1;
}
Some(timer) Some(timer)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment