From owner-p4-projects@FreeBSD.ORG Tue Feb 13 13:42:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B278516A407; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EF7C16A400 for ; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6A5DC13C4AA for ; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DDg5RW030988 for ; Tue, 13 Feb 2007 13:42:05 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DDg4bu030984 for perforce@freebsd.org; Tue, 13 Feb 2007 13:42:04 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 13 Feb 2007 13:42:04 GMT Message-Id: <200702131342.l1DDg4bu030984@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 114451 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: Tue, 13 Feb 2007 13:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=114451 Change 114451 by zec@zec_tca51 on 2007/02/13 13:41:31 Iterate through all vnets in tcp_drain() and in_rtqdrain(). Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#7 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#10 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#7 (text+ko) ==== @@ -464,7 +464,7 @@ IGMP_PRINTF("[igmp.c,_slowtimo] -- > entering \n"); mtx_lock(&igmp_mtx); VNETB_ITERLOOP_BEGIN() - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_iter); SLIST_FOREACH(rti, &V_router_info_head, rti_list) { if (rti->rti_type == IGMP_V1_ROUTER) { rti->rti_time++; ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -319,7 +319,8 @@ void in_rtqdrain(void) { - INIT_VNET_NET(curvnetb); + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_NET(vnetb_iter); struct radix_node_head *rnh = V_rt_tables[AF_INET]; struct rtqk_arg arg; @@ -331,6 +332,7 @@ RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); + VNETB_ITERLOOP_END(); } /* ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#8 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#8 (text+ko) ==== @@ -635,7 +635,7 @@ int i; VNETB_ITERLOOP_BEGIN() - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_iter); if (V_tcp_hostcache.purgeall) { all = 1; V_tcp_hostcache.purgeall = 0; ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#10 (text+ko) ==== @@ -887,7 +887,8 @@ void tcp_drain(void) { - INIT_VNET_INET(curvnetb); + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_INET(vnetb_iter); if (do_tcpdrain) { struct inpcb *inpb; @@ -922,6 +923,8 @@ } INP_INFO_RUNLOCK(&V_tcbinfo); } + + VNETB_ITERLOOP_END(); } /*