From owner-svn-src-all@FreeBSD.ORG Wed Apr 13 11:28:47 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 293C01065673; Wed, 13 Apr 2011 11:28:47 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 174788FC15; Wed, 13 Apr 2011 11:28:47 +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 p3DBSkOF078799; Wed, 13 Apr 2011 11:28:46 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3DBSkjs078792; Wed, 13 Apr 2011 11:28:46 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201104131128.p3DBSkjs078792@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 13 Apr 2011 11:28:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220592 - in head/sys: kern netinet netinet/cc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2011 11:28:47 -0000 Author: pluknet Date: Wed Apr 13 11:28:46 2011 New Revision: 220592 URL: http://svn.freebsd.org/changeset/base/220592 Log: Staticize malloc types. Approved by: lstewart MFC after: 1 week Modified: head/sys/kern/kern_hhook.c head/sys/netinet/cc/cc_chd.c head/sys/netinet/cc/cc_cubic.c head/sys/netinet/cc/cc_htcp.c head/sys/netinet/cc/cc_vegas.c head/sys/netinet/siftr.c Modified: head/sys/kern/kern_hhook.c ============================================================================== --- head/sys/kern/kern_hhook.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/kern/kern_hhook.c Wed Apr 13 11:28:46 2011 (r220592) @@ -58,8 +58,7 @@ struct hhook { STAILQ_ENTRY(hhook) hhk_next; }; -MALLOC_DECLARE(M_HHOOK); -MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hhook_head lists"); +static MALLOC_DEFINE(M_HHOOK, "hhook", "Helper hooks are linked off hhook_head lists"); LIST_HEAD(hhookheadhead, hhook_head); VNET_DEFINE(struct hhookheadhead, hhook_head_list); Modified: head/sys/netinet/cc/cc_chd.c ============================================================================== --- head/sys/netinet/cc/cc_chd.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/netinet/cc/cc_chd.c Wed Apr 13 11:28:46 2011 (r220592) @@ -127,8 +127,7 @@ static VNET_DEFINE(uint32_t, chd_qthresh #define V_chd_loss_fair VNET(chd_loss_fair) #define V_chd_use_max VNET(chd_use_max) -MALLOC_DECLARE(M_CHD); -MALLOC_DEFINE(M_CHD, "chd data", +static MALLOC_DEFINE(M_CHD, "chd data", "Per connection data required for the CHD congestion control algorithm"); struct cc_algo chd_cc_algo = { Modified: head/sys/netinet/cc/cc_cubic.c ============================================================================== --- head/sys/netinet/cc/cc_cubic.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/netinet/cc/cc_cubic.c Wed Apr 13 11:28:46 2011 (r220592) @@ -98,8 +98,7 @@ struct cubic { int t_last_cong; }; -MALLOC_DECLARE(M_CUBIC); -MALLOC_DEFINE(M_CUBIC, "cubic data", +static MALLOC_DEFINE(M_CUBIC, "cubic data", "Per connection data required for the CUBIC congestion control algorithm"); struct cc_algo cubic_cc_algo = { Modified: head/sys/netinet/cc/cc_htcp.c ============================================================================== --- head/sys/netinet/cc/cc_htcp.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/netinet/cc/cc_htcp.c Wed Apr 13 11:28:46 2011 (r220592) @@ -173,8 +173,7 @@ static VNET_DEFINE(u_int, htcp_rtt_scali #define V_htcp_adaptive_backoff VNET(htcp_adaptive_backoff) #define V_htcp_rtt_scaling VNET(htcp_rtt_scaling) -MALLOC_DECLARE(M_HTCP); -MALLOC_DEFINE(M_HTCP, "htcp data", +static MALLOC_DEFINE(M_HTCP, "htcp data", "Per connection data required for the HTCP congestion control algorithm"); struct cc_algo htcp_cc_algo = { Modified: head/sys/netinet/cc/cc_vegas.c ============================================================================== --- head/sys/netinet/cc/cc_vegas.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/netinet/cc/cc_vegas.c Wed Apr 13 11:28:46 2011 (r220592) @@ -105,8 +105,7 @@ static VNET_DEFINE(uint32_t, vegas_beta) #define V_vegas_alpha VNET(vegas_alpha) #define V_vegas_beta VNET(vegas_beta) -MALLOC_DECLARE(M_VEGAS); -MALLOC_DEFINE(M_VEGAS, "vegas data", +static MALLOC_DEFINE(M_VEGAS, "vegas data", "Per connection data required for the Vegas congestion control algorithm"); struct cc_algo vegas_cc_algo = { Modified: head/sys/netinet/siftr.c ============================================================================== --- head/sys/netinet/siftr.c Wed Apr 13 06:36:22 2011 (r220591) +++ head/sys/netinet/siftr.c Wed Apr 13 11:28:46 2011 (r220592) @@ -156,14 +156,11 @@ __FBSDID("$FreeBSD$"); #define THIRD_OCTET(X) (((X) & 0x0000FF00) >> 8) #define FOURTH_OCTET(X) ((X) & 0x000000FF) -MALLOC_DECLARE(M_SIFTR); -MALLOC_DEFINE(M_SIFTR, "siftr", "dynamic memory used by SIFTR"); - -MALLOC_DECLARE(M_SIFTR_PKTNODE); -MALLOC_DEFINE(M_SIFTR_PKTNODE, "siftr_pktnode", "SIFTR pkt_node struct"); - -MALLOC_DECLARE(M_SIFTR_HASHNODE); -MALLOC_DEFINE(M_SIFTR_HASHNODE, "siftr_hashnode", "SIFTR flow_hash_node struct"); +static MALLOC_DEFINE(M_SIFTR, "siftr", "dynamic memory used by SIFTR"); +static MALLOC_DEFINE(M_SIFTR_PKTNODE, "siftr_pktnode", + "SIFTR pkt_node struct"); +static MALLOC_DEFINE(M_SIFTR_HASHNODE, "siftr_hashnode", + "SIFTR flow_hash_node struct"); /* Used as links in the pkt manager queue. */ struct pkt_node {