From owner-svn-src-head@FreeBSD.ORG Sat Feb 27 12:16:00 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19BB0106566B; Sat, 27 Feb 2010 12:16:00 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 088D98FC1E; Sat, 27 Feb 2010 12:16:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1RCFx9B056230; Sat, 27 Feb 2010 12:15:59 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1RCFxGg056229; Sat, 27 Feb 2010 12:15:59 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201002271215.o1RCFxGg056229@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 27 Feb 2010 12:15:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204410 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Feb 2010 12:16:00 -0000 Author: jilles Date: Sat Feb 27 12:15:59 2010 New Revision: 204410 URL: http://svn.freebsd.org/changeset/base/204410 Log: Include terminated threads in ps's process cpu time field. MFC after: 2 weeks Modified: head/sys/kern/kern_proc.c Modified: head/sys/kern/kern_proc.c ============================================================================== --- head/sys/kern/kern_proc.c Sat Feb 27 10:55:43 2010 (r204409) +++ head/sys/kern/kern_proc.c Sat Feb 27 12:15:59 2010 (r204410) @@ -676,11 +676,9 @@ fill_kinfo_aggregate(struct proc *p, str kp->ki_estcpu = 0; kp->ki_pctcpu = 0; - kp->ki_runtime = 0; FOREACH_THREAD_IN_PROC(p, td) { thread_lock(td); kp->ki_pctcpu += sched_pctcpu(td); - kp->ki_runtime += cputick2usec(td->td_runtime); kp->ki_estcpu += td->td_estcpu; thread_unlock(td); }