summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2012-04-06 02:18:49 +0000
committerguenther <guenther@openbsd.org>2012-04-06 02:18:49 +0000
commitd803ad6e68faf4dca77397470e9d7977822a30ea (patch)
treed03bb9cc0528308e3722a5275fe997f9ef74bff0
parentIn the neverending tradition of never making things simple, SGI used 1940 as (diff)
downloadwireguard-openbsd-d803ad6e68faf4dca77397470e9d7977822a30ea.tar.xz
wireguard-openbsd-d803ad6e68faf4dca77397470e9d7977822a30ea.zip
ruadd() does the summing of system and user times, so doing so again
results in bogus total times, as reported by numerous ports people. ok miod@
-rw-r--r--sys/kern/kern_exit.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index d3225d4e350..a715cd1f1b0 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exit.c,v 1.109 2012/03/23 15:51:26 guenther Exp $ */
+/* $OpenBSD: kern_exit.c,v 1.110 2012/04/06 02:18:49 guenther Exp $ */
/* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */
/*
@@ -297,8 +297,6 @@ exit1(struct proc *p, int rv, int flags)
*/
calcru(&pr->ps_tu, &rup->ru_utime, &rup->ru_stime, NULL);
ruadd(rup, &pr->ps_cru);
- timeradd(&rup->ru_utime, &pr->ps_cru.ru_utime, &rup->ru_utime);
- timeradd(&rup->ru_stime, &pr->ps_cru.ru_stime, &rup->ru_stime);
/* notify interested parties of our demise and clean up */
knote_processexit(pr);
@@ -552,8 +550,6 @@ proc_finish_wait(struct proc *waiter, struct proc *p)
p->p_xstat = 0;
rup = &waiter->p_p->ps_cru;
ruadd(rup, pr->ps_ru);
- timeradd(&rup->ru_utime, &pr->ps_ru->ru_utime, &rup->ru_utime);
- timeradd(&rup->ru_stime, &pr->ps_ru->ru_stime, &rup->ru_stime);
proc_zap(p);
}
}