From owner-p4-projects@FreeBSD.ORG Sat Jul 28 17:44:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1699A16A41A; Sat, 28 Jul 2007 17:44:21 +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 D8E1716A418 for ; Sat, 28 Jul 2007 17:44:20 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC89113C458 for ; Sat, 28 Jul 2007 17:44:20 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6SHiKZS067343 for ; Sat, 28 Jul 2007 17:44:20 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6SHiKwh067340 for perforce@freebsd.org; Sat, 28 Jul 2007 17:44:20 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 28 Jul 2007 17:44:20 GMT Message-Id: <200707281744.l6SHiKwh067340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 124273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2007 17:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=124273 Change 124273 by zec@zec_tpx32 on 2007/07/28 17:43:35 Rearrange bootstraping of ipport_tick() and tcp_isn_tick() so they are not called directly during system autoconfiguration, but rather exclusively from the system timer scheduler. This prevents a few benign yet annoying vnet stacking warnings from being displayed while the system boots. While here, slightly rearrange the format of vnet stacking warning messages. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_input.c#18 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#23 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#27 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#18 (text+ko) ==== @@ -333,7 +333,7 @@ /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); - ipport_tick(NULL); + callout_reset(&ipport_tick_callout, 1, ipport_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, SHUTDOWN_PRI_DEFAULT); EVENTHANDLER_REGISTER(nmbclusters_change, ipq_zone_change, ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#23 (text+ko) ==== @@ -371,7 +371,7 @@ tcp_reass_init(); ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); - tcp_isn_tick(NULL); + callout_reset(&isn_callout, 1, tcp_isn_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, ==== //depot/projects/vimage/src/sys/sys/vimage.h#27 (text+ko) ==== @@ -167,9 +167,9 @@ #define CURVNET_SET_VERBOSE(arg) \ CURVNET_SET_QUIET(arg) \ if (saved_vnet) \ - printf("curvnet_set() in %s cpu %d: %p (%s) -> %p\n", \ - curthread->td_vnet_lpush, curcpu, saved_vnet, \ - saved_vnet_lpush, curvnet); + printf("curvnet_set(%p) in %s() on cpu %d, prev %s(%p)\n", \ + curvnet, curthread->td_vnet_lpush, curcpu, \ + saved_vnet_lpush, saved_vnet); #define CURVNET_SET(arg) CURVNET_SET_VERBOSE(arg)