From 5704ba6a06d36242c8f6bbd10a29fa6df6f4cc78 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sun, 5 Apr 1998 12:10:41 +0000 Subject: [PATCH] More fixes for the iterative case of nanosleep1 from bruce. I hate the 2-arg time{spec|val}{add|sub} functions! --- sys/kern/kern_time.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 6337414b9fe5..452e0e024c62 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.49 1998/04/05 11:17:19 peter Exp $ + * $Id: kern_time.c,v 1.50 1998/04/05 11:49:36 phk Exp $ */ #include @@ -194,7 +194,7 @@ nanosleep1(p, rqt, rmt) struct proc *p; struct timespec *rqt, *rmt; { - struct timespec ts, ts2; + struct timespec ts, ts2, ts3; struct timeval tv; int error; @@ -222,9 +222,9 @@ nanosleep1(p, rqt, rmt) } if (timespeccmp(&ts2, &ts, >=)) return (0); - getnanoruntime(&ts2); - timespecsub(&ts2, &ts); - TIMESPEC_TO_TIMEVAL(&tv, &ts2); + ts3 = ts; + timespecsub(&ts3, &ts2); + TIMESPEC_TO_TIMEVAL(&tv, &ts3); } }