From owner-svn-src-projects@FreeBSD.ORG Mon Jun 4 11:30:01 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA21B106566C; Mon, 4 Jun 2012 11:30:01 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail03.syd.optusnet.com.au (mail03.syd.optusnet.com.au [211.29.132.184]) by mx1.freebsd.org (Postfix) with ESMTP id 48AA68FC0C; Mon, 4 Jun 2012 11:29:59 +0000 (UTC) Received: from c122-106-171-232.carlnfd1.nsw.optusnet.com.au (c122-106-171-232.carlnfd1.nsw.optusnet.com.au [122.106.171.232]) by mail03.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id q54BTkqg018554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 4 Jun 2012 21:29:48 +1000 Date: Mon, 4 Jun 2012 21:29:46 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Gleb Smirnoff In-Reply-To: <201206041009.q54A9v4A019437@svn.freebsd.org> Message-ID: <20120604210548.Y1459@besplex.bde.org> References: <201206041009.q54A9v4A019437@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r236554 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2012 11:30:01 -0000 On Mon, 4 Jun 2012, Gleb Smirnoff wrote: > Log: > Consistent names for pf(4) malloc(9) types. Many still have spaces in them. This breaks at least simple parsing of "vmstat -m" output using columns in awk (and postprocessing of vmstat -m output is more needed than orginally, since vmstat is now too stupid to even print the totals). A few bugs in this area have been fixed relatively recently. For example: file desc -> filedesc (matches original naming scheme -- no underscore) BIO buffer -> biobuf UFS mount -> ufs_mount (now just a style bug -- underscore) VM pgdata -> vm_pgdata * ihash -> [went away] struct cdev * -> [went away] cluster_save buffer -> [went away] (was also too long) [too many] -> [vmstat -z, with worse names and formatting] Now broken on ref10-i386: NFSCL diroffd NFS fh only. > Modified: projects/pf/head/sys/contrib/pf/net/pf.c > ============================================================================== > --- projects/pf/head/sys/contrib/pf/net/pf.c Mon Jun 4 09:55:47 2012 (r236553) > +++ projects/pf/head/sys/contrib/pf/net/pf.c Mon Jun 4 10:09:57 2012 (r236554) > @@ -155,7 +155,7 @@ VNET_DEFINE(struct pf_anchor_stackframe, > /* > * Queue for pf_intr() sends. > */ > -MALLOC_DEFINE(M_PFTEMP, "pf temp", "pf(4) temporary allocations"); > +static MALLOC_DEFINE(M_PFTEMP, "pf(4) temp", "pf(4) temporary allocations"); > struct pf_send_entry { > STAILQ_ENTRY(pf_send_entry) pfse_next; > struct mbuf *pfse_m; > @@ -350,7 +350,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[P > s->rule.ptr->states_cur--; \ > } while (0) > > -MALLOC_DEFINE(M_PFHASH, "pf hashes", "pf(4) hash header structures"); > +static MALLOC_DEFINE(M_PFHASH, "pf(4) hash", "pf(4) hash header structures"); > /* XXXGL: make static? */ > VNET_DEFINE(struct pf_keyhash *, pf_keyhash); > VNET_DEFINE(struct pf_idhash *, pf_idhash); Space after "pf(4)" The punctuation might be hard to parse too. The verbose descriptions made it reasonable for the short descriptions to be even shorter, but they are mostly longer. Others similarly. Bruce