From owner-svn-src-user@FreeBSD.ORG Mon Oct 12 17:03:58 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 27A6F1065670;
Mon, 12 Oct 2009 17:03:58 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id F29EF8FC15;
Mon, 12 Oct 2009 17:03:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CH3vHN078254;
Mon, 12 Oct 2009 17:03:57 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9CH3vEc078251;
Mon, 12 Oct 2009 17:03:57 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910121703.n9CH3vEc078251@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Mon, 12 Oct 2009 17:03:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r197993 - user/eri/pf45/head/sys/contrib/pf/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 17:03:58 -0000
Author: eri
Date: Mon Oct 12 17:03:57 2009
New Revision: 197993
URL: http://svn.freebsd.org/changeset/base/197993
Log:
Finish converting all global variables to virtualize declarations.
Modified:
user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c
user/eri/pf45/head/sys/contrib/pf/net/pf_table.c
Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Mon Oct 12 16:56:28 2009 (r197992)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Mon Oct 12 17:03:57 2009 (r197993)
@@ -91,8 +91,13 @@ __FBSDID("$FreeBSD$");
#endif /* _KERNEL */
+#ifdef __FreeBSD__
+VNET_DEFINE(struct pf_anchor_global, pf_anchors);
+VNET_DEFINE(struct pf_anchor, pf_main_anchor);
+#else
struct pf_anchor_global pf_anchors;
struct pf_anchor pf_main_anchor;
+#endif
static __inline int pf_anchor_compare(struct pf_anchor *, struct pf_anchor *);
Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_table.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_table.c Mon Oct 12 16:56:28 2009 (r197992)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_table.c Mon Oct 12 17:03:57 2009 (r197993)
@@ -175,19 +175,28 @@ struct pfr_walktree {
#define senderr(e) do { rv = (e); goto _bad; } while (0)
- #ifdef __FreeBSD__
- uma_zone_t pfr_ktable_pl;
- uma_zone_t pfr_kentry_pl;
- uma_zone_t pfr_kcounters_pl;
- #else
+#ifdef __FreeBSD__
+VNET_DEFINE(uma_zone_t, pfr_ktable_pl);
+VNET_DEFINE(uma_zone_t, pfr_kentry_pl);
+VNET_DEFINE(uma_zone_t, pfr_kcounters_pl);
+#define pfr_kcounters_pl VNET(pfr_kcounters_pl)
+VNET_DEFINE(struct sockaddr_in, pfr_sin);
+#define pfr_sin VNET(pfr_sin)
+VNET_DEFINE(struct sockaddr_in6, pfr_sin6);
+#define pfr_sin6 VNET(pfr_sin6)
+VNET_DEFINE(union sockaddr_union, pfr_mask);
+#define pfr_mask VNET(pfr_mask)
+VNET_DEFINE(struct pf_addr, pfr_ffaddr);
+#define pfr_ffaddr VNET(pfr_ffaddr)
+#else
struct pool pfr_ktable_pl;
struct pool pfr_kentry_pl;
struct pool pfr_kcounters_pl;
-#endif
struct sockaddr_in pfr_sin;
struct sockaddr_in6 pfr_sin6;
union sockaddr_union pfr_mask;
struct pf_addr pfr_ffaddr;
+#endif
void pfr_copyout_addr(struct pfr_addr *,
struct pfr_kentry *ke);