clock: Fix spinning

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/clock.rs b/src/clock.rs
index aa8faa2dd863d033db98f3ce5b42f8713b4bbe52..ce9a065f37772c78368264f71871d8fbb126631d 100644 (file)
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -297,8 +297,6 @@ impl ThreadState {
   #[throws(IE)]
   fn run(mut self) {
     loop {
-      // xxx this seems to spin
-
       match self.next_wakeup {
         Some(wakeup) => {
           let timeout = wakeup - now()?;
@@ -341,10 +339,11 @@ impl ThreadState {
             || internal_error_bydebug(&state)
           )?.expires - now;
           state.users[user].remaining = remaining;
-          Some(libc::timespec {
+          let pause: TimeSpec = libc::timespec {
             tv_sec: 0,
             tv_nsec: remaining.tv_nsec(),
-          }.into())
+          }.into();
+          Some(pause + now)
         } else {
           None
         };