From owner-svn-src-all@FreeBSD.ORG  Fri Oct 24 15:11:12 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A5CC1065682;
	Fri, 24 Oct 2008 15:11:12 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id BDF708FC16;
	Fri, 24 Oct 2008 15:11:11 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from localhost.corp.yahoo.com (john@localhost [IPv6:::1])
	(authenticated bits=0)
	by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m9OFB5aT040064;
	Fri, 24 Oct 2008 11:11:05 -0400 (EDT) (envelope-from jhb@freebsd.org)
From: John Baldwin <jhb@freebsd.org>
To: David Xu <davidxu@freebsd.org>
Date: Fri, 24 Oct 2008 10:27:23 -0400
User-Agent: KMail/1.9.7
References: <200810240109.m9O19P1u071214@svn.freebsd.org>
In-Reply-To: <200810240109.m9O19P1u071214@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200810241027.24970.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-2.0.2 (server.baldwin.cx [IPv6:::1]);
	Fri, 24 Oct 2008 11:11:05 -0400 (EDT)
X-Virus-Scanned: ClamAV 0.93.1/8485/Fri Oct 24 09:38:51 2008 on
	server.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.6 required=4.2 tests=BAYES_00,NO_RELAYS 
	autolearn=ham version=3.1.3
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r184217 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Oct 2008 15:11:12 -0000

On Thursday 23 October 2008 09:09:25 pm David Xu wrote:
> 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.

Actually, it does prevent rearming from within the callout routine itself 
while waiting:

int
callout_reset_on(struct callout *c, int to_ticks, void (*ftn)(void *),
    void *arg, int cpu)
{
	...
	if (cc->cc_curr == c) {
		...
		if (cc->cc_waiting) {
			/*
			 * Someone has called callout_drain to kill this
			 * callout.  Don't reschedule.
			 */
			CTR4(KTR_CALLOUT, "%s %p func %p arg %p",
			    cancelled ? "cancelled" : "failed to cancel",
			    c, c->c_func, c->c_arg);
			CC_UNLOCK(cc);
			return (cancelled);
		}
	}
	...
}

Lots of callouts using callout_init_mtx() (e.g. all the callouts in the NIC 
drivers) depend on this feature.  Please revert this.

-- 
John Baldwin