From owner-svn-src-head@FreeBSD.ORG Fri Oct 24 01:09:25 2008 Return-Path: <owner-svn-src-head@FreeBSD.ORG> 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 5325D106566C; Fri, 24 Oct 2008 01:09:25 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 415088FC14; Fri, 24 Oct 2008 01:09:25 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O19P7L071215; Fri, 24 Oct 2008 01:09:25 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9O19P1u071214; Fri, 24 Oct 2008 01:09:25 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <200810240109.m9O19P1u071214@svn.freebsd.org> From: David Xu <davidxu@FreeBSD.org> Date: Fri, 24 Oct 2008 01:09:25 +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: r184217 - 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 <svn-src-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 24 Oct 2008 01:09:25 -0000 Author: davidxu Date: Fri Oct 24 01:09:24 2008 New Revision: 184217 URL: http://svn.freebsd.org/changeset/base/184217 Log: Don't rearm callout if the process is exiting, it may leak a callout because callout_drain() only waits for running callout, but not disable it if it is rearmed. Modified: head/sys/kern/kern_resource.c Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Fri Oct 24 01:03:31 2008 (r184216) +++ head/sys/kern/kern_resource.c Fri Oct 24 01:09:24 2008 (r184217) @@ -638,7 +638,8 @@ lim_cb(void *arg) psignal(p, SIGXCPU); } } - callout_reset(&p->p_limco, hz, lim_cb, p); + if ((p->p_flag & P_WEXIT) == 0) + callout_reset(&p->p_limco, hz, lim_cb, p); } int