Make user/system times increase monotonically. ok deraadt@ and millert@

1 files changed, 17 insertions, 30 deletions

diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 0b65376886f..91a2afe7f0c 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_resource.c,v 1.16 2001/11/10 19:20:39 art Exp $	*/
+/*	$OpenBSD: kern_resource.c,v 1.17 2001/12/20 21:56:19 nordin Exp $	*/
 /*	$NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $	*/
 
 /*-
@@ -340,15 +340,14 @@ sys_getrlimit(p, v, retval)
  */
 void
 calcru(p, up, sp, ip)
-	register struct proc *p;
-	register struct timeval *up;
-	register struct timeval *sp;
-	register struct timeval *ip;
+	struct proc *p;
+	struct timeval *up;
+	struct timeval *sp;
+	struct timeval *ip;
 {
-	register u_quad_t u, st, ut, it, tot;
-	register long sec, usec;
-	register int s;
-	struct timeval tv;
+	u_quad_t st, ut, it;
+	int freq;
+	int s;
 
 	s = splstatclock();
 	st = p->p_sticks;
@@ -356,36 +355,24 @@ calcru(p, up, sp, ip)
 	it = p->p_iticks;
 	splx(s);
 
-	tot = st + ut + it;
-	if (tot == 0) {
-		up->tv_sec = up->tv_usec = 0;
-		sp->tv_sec = sp->tv_usec = 0;
+	if (st + ut + it == 0) {
+		timerclear(up);
+		timerclear(sp);
 		if (ip != NULL)
-			ip->tv_sec = ip->tv_usec = 0;
+			timerclear(ip);
 		return;
 	}
 
-	sec = p->p_rtime.tv_sec;
-	usec = p->p_rtime.tv_usec;
-	if (p == curproc) {
-		/*
-		 * Adjust for the current time slice.  This is actually fairly
-		 * important since the error here is on the order of a time
-		 * quantum, which is much greater than the sampling error.
-		 */
-		microtime(&tv);
-		sec += tv.tv_sec - runtime.tv_sec;
-		usec += tv.tv_usec - runtime.tv_usec;
-	}
-	u = (u_quad_t) sec * 1000000 + usec;
-	st = (u * st) / tot;
+	freq = stathz ? stathz : hz;
+
+	st = st * 1000000 / freq;
 	sp->tv_sec = st / 1000000;
 	sp->tv_usec = st % 1000000;
-	ut = (u * ut) / tot;
+	ut = ut * 1000000 / freq;
 	up->tv_sec = ut / 1000000;
 	up->tv_usec = ut % 1000000;
 	if (ip != NULL) {
-		it = (u * it) / tot;
+		it = it * 1000000 / freq;
 		ip->tv_sec = it / 1000000;
 		ip->tv_usec = it % 1000000;
 	}