Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched_pstats: fix previous, exclude system/softintr threads from loadavg.

Browse Source
This commit is contained in:
rmind 2010-04-20 16:49:48 +00:00
parent 6e8e516ce0
commit f08aebed01
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/kern/kern_synch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_synch.c,v 1.281 2010/04/16 03:21:49 rmind Exp $ */ /* $NetBSD: kern_synch.c,v 1.282 2010/04/20 16:49:48 rmind Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009 * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@ -69,7 +69,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.281 2010/04/16 03:21:49 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.282 2010/04/20 16:49:48 rmind Exp $");
#include "opt_kstack.h" #include "opt_kstack.h"
#include "opt_perfctrs.h" #include "opt_perfctrs.h"
@ -1198,20 +1198,10 @@ sched_pstats(void)
runtm += l->l_rtime.sec; runtm += l->l_rtime.sec;
l->l_swtime++; l->l_swtime++;
sched_lwp_stats(l); sched_lwp_stats(l);
lwp_unlock(l);
l->l_pctcpu = (l->l_pctcpu * ccpu) >> FSHIFT;
if (l->l_slptime != 0)
continue;
lpctcpu = l->l_pctcpu;
lcpticks = atomic_swap_uint(&l->l_cpticks, 0);
lpctcpu += ((FSCALE - ccpu) *
(lcpticks * FSCALE / clkhz)) >> FSHIFT;
l->l_pctcpu = lpctcpu;
/* For load average calculation. */ /* For load average calculation. */
if (__predict_false(lavg_count == 0)) { if (__predict_false(lavg_count == 0) &&
(l->l_flag & (LW_SINTR | LW_SYSTEM)) == 0) {
switch (l->l_stat) { switch (l->l_stat) {
case LSSLEEP: case LSSLEEP:
if (l->l_slptime > 1) { if (l->l_slptime > 1) {
@ -1223,6 +1213,17 @@ sched_pstats(void)
nrun++; nrun++;
} }
} }
lwp_unlock(l);
l->l_pctcpu = (l->l_pctcpu * ccpu) >> FSHIFT;
if (l->l_slptime != 0)
continue;
lpctcpu = l->l_pctcpu;
lcpticks = atomic_swap_uint(&l->l_cpticks, 0);
lpctcpu += ((FSCALE - ccpu) *
(lcpticks * FSCALE / clkhz)) >> FSHIFT;
l->l_pctcpu = lpctcpu;
} }
/* Calculating p_pctcpu only for ps(1) */ /* Calculating p_pctcpu only for ps(1) */
p->p_pctcpu = (p->p_pctcpu * ccpu) >> FSHIFT; p->p_pctcpu = (p->p_pctcpu * ccpu) >> FSHIFT;