From owner-p4-projects@FreeBSD.ORG  Tue Apr 28 17:59:40 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 83B2B1065677; Tue, 28 Apr 2009 17:59:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41952106566C
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 17:59:40 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outF.internet-mail-service.net (outf.internet-mail-service.net
	[216.240.47.229])
	by mx1.freebsd.org (Postfix) with ESMTP id 293D78FC1E
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 17:59:39 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from idiom.com (mx0.idiom.com [216.240.32.160])
	by out.internet-mail-service.net (Postfix) with ESMTP id 3AE6F14E00D;
	Tue, 28 Apr 2009 10:59:47 -0700 (PDT)
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38])
	by idiom.com (Postfix) with ESMTP id 92E8D2D614C;
	Tue, 28 Apr 2009 10:59:39 -0700 (PDT)
Message-ID: <49F74413.3090002@elischer.org>
Date: Tue, 28 Apr 2009 10:59:47 -0700
From: Julian Elischer <julian@elischer.org>
User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302)
MIME-Version: 1.0
To: Marko Zec <zec@FreeBSD.org>
References: <200904281751.n3SHpTWw007937@repoman.freebsd.org>
In-Reply-To: <200904281751.n3SHpTWw007937@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 161261 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Apr 2009 17:59:41 -0000

Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=161261
> 
> Change 161261 by zec@zec_amdx2 on 2009/04/28 17:51:16
> 
> 	Unbreak in_rtqtimo().
> 

so, If I'm right,
the plan is:

commit vimage-commit, with one single vimage
leave to simmer for a week while people test
commit vimage-commit2.. in time for BSDCan..

Oh this is so exciting.. :-)



> Affected files ...
> 
> .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#28 edit
> 
> Differences ...
> 
> ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#28 (text+ko) ====
> 
> @@ -250,14 +250,13 @@
>  static void
>  in_rtqtimo(void *rock)
>  {
> +	CURVNET_SET((struct vnet *) rock);
>  	INIT_VNET_NET(curvnet);
>  	INIT_VNET_INET(curvnet);
>  	int fibnum;
>  	void *newrock;
>  	struct timeval atv;
>  
> -	KASSERT((rock == (void *)V_rt_tables[0][AF_INET]),
> -			("in_rtqtimo: unexpected arg"));
>  	for (fibnum = 0; fibnum < rt_numfibs; fibnum++) {
>  		if ((newrock = V_rt_tables[fibnum][AF_INET]) != NULL)
>  			in_rtqtimo_one(newrock);
> @@ -265,6 +264,7 @@
>  	atv.tv_usec = 0;
>  	atv.tv_sec = V_rtq_timeout;
>  	callout_reset(&V_rtq_timer, tvtohz(&atv), in_rtqtimo, rock);
> +	CURVNET_RESTORE();
>  }
>  
>  static void
> @@ -377,7 +377,7 @@
>  	rnh->rnh_close = in_clsroute;
>  	if (_in_rt_was_here == 0 ) {
>  		callout_init(&V_rtq_timer, CALLOUT_MPSAFE);
> -		in_rtqtimo(rnh);	/* kick off timeout first time */
> +		callout_reset(&V_rtq_timer, 1, in_rtqtimo, curvnet);
>  		_in_rt_was_here = 1;
>  	}
>  	return 1;