From owner-p4-projects@FreeBSD.ORG Thu Sep 4 16:26:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAD3916A4C1; Thu, 4 Sep 2003 16:26:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DAB616A4BF for ; Thu, 4 Sep 2003 16:26:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E40F743FF5 for ; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h84NQN0U056175 for ; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h84NQNQt056172 for perforce@freebsd.org; Thu, 4 Sep 2003 16:26:23 -0700 (PDT) Date: Thu, 4 Sep 2003 16:26:23 -0700 (PDT) Message-Id: <200309042326.h84NQNQt056172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 37539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 23:26:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=37539 Change 37539 by sam@sam_ebb on 2003/09/04 16:26:00 remove unneeded domain list locking Affected files ... .. //depot/projects/netperf/sys/kern/subr_mbuf.c#6 edit .. //depot/projects/netperf/sys/kern/vfs_export.c#4 edit .. //depot/projects/netperf/sys/net/radix.c#3 edit .. //depot/projects/netperf/sys/net/route.c#8 edit .. //depot/projects/netperf/sys/sys/domain.h#3 edit Differences ... ==== //depot/projects/netperf/sys/kern/subr_mbuf.c#6 (text+ko) ==== @@ -1033,12 +1033,10 @@ mbstat.m_drain++; /* XXX: No consistency. */ - DOMAIN_LOCK(); for (dp = domains; dp != NULL; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_drain != NULL) (*pr->pr_drain)(); - DOMAIN_UNLOCK(); } /****************************************************************************** ==== //depot/projects/netperf/sys/kern/vfs_export.c#4 (text+ko) ==== @@ -146,14 +146,12 @@ * Seems silly to initialize every AF when most are not used, * do so on demand here */ - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_family == i && dom->dom_rtattach) { dom->dom_rtattach((void **) &nep->ne_rtable[i], dom->dom_rtoffset); break; } - DOMAIN_UNLOCK(); if ((rnh = nep->ne_rtable[i]) == NULL) { error = ENOBUFS; goto out; ==== //depot/projects/netperf/sys/net/radix.c#3 (text+ko) ==== @@ -1059,11 +1059,9 @@ #ifdef _KERNEL struct domain *dom; - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_maxrtkey > max_keylen) max_keylen = dom->dom_maxrtkey; - DOMAIN_UNLOCK(); #endif if (max_keylen == 0) { log(LOG_ERR, ==== //depot/projects/netperf/sys/net/route.c#8 (text+ko) ==== @@ -67,12 +67,10 @@ rtable_init(void **table) { struct domain *dom; - DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_rtattach) dom->dom_rtattach(&table[dom->dom_family], dom->dom_rtoffset); - DOMAIN_UNLOCK(); } void ==== //depot/projects/netperf/sys/sys/domain.h#3 (text+ko) ==== @@ -67,10 +67,6 @@ extern struct domain *domains; extern struct domain localdomain; extern void net_add_domain(void *); -extern struct mtx dom_mtx; - -#define DOMAIN_LOCK() mtx_lock(&dom_mtx) -#define DOMAIN_UNLOCK() mtx_unlock(&dom_mtx) #define DOMAIN_SET(name) \ SYSINIT(domain_ ## name, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, net_add_domain, & name ## domain)