From 5464273ad70a1fc80994e78e7f8f16b771fc9dbb Mon Sep 17 00:00:00 2001 From: tjr Date: Fri, 25 Apr 2003 00:20:40 +0000 Subject: Include altkstack pages in the RSS regardless of whether the process is swapped out. Pointed out by jhb. --- sys/kern/kern_proc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'sys/kern/kern_proc.c') diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index dd7863b..111c0f2 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -662,15 +662,13 @@ fill_kinfo_proc(p, kp) kp->ki_size = vm->vm_map.size; kp->ki_rssize = vmspace_resident_count(vm); /*XXX*/ - if (p->p_sflag & PS_INMEM) { + if (p->p_sflag & PS_INMEM) kp->ki_rssize += UAREA_PAGES; - FOREACH_THREAD_IN_PROC(p, td0) { - if (!TD_IS_SWAPPED(td0)) - kp->ki_rssize += td0->td_kstack_pages; - if (td0->td_altkstack_obj != NULL) - kp->ki_rssize += - td0->td_altkstack_pages; - } + FOREACH_THREAD_IN_PROC(p, td0) { + if (!TD_IS_SWAPPED(td0)) + kp->ki_rssize += td0->td_kstack_pages; + if (td0->td_altkstack_obj != NULL) + kp->ki_rssize += td0->td_altkstack_pages; } kp->ki_swrss = vm->vm_swrss; kp->ki_tsize = vm->vm_tsize; -- cgit v1.1