Fix redox epoll timeout

This commit is contained in:
Jeremy Soller
2019-04-28 13:10:34 -06:00
parent 6a9d070115
commit d2cb0959f3
+10 -9
View File
@@ -68,15 +68,6 @@ impl PalEpoll for Sys {
match File::open(c_str!("time:4"), O_RDWR) {
Err(_) => return -1,
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(
epfd,
&Event {
@@ -89,6 +80,16 @@ impl PalEpoll for Sys {
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)
}
}