From owner-p4-projects@FreeBSD.ORG  Fri Aug 15 15:37:51 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BF2337B404; Fri, 15 Aug 2003 15:37:50 -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 B4A1237B442
	for <perforce@freebsd.org>; Fri, 15 Aug 2003 15:37:48 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 526DC43FCB
	for <perforce@freebsd.org>; Fri, 15 Aug 2003 15:37:48 -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 h7FMbm0U096564
	for <perforce@freebsd.org>; Fri, 15 Aug 2003 15:37:48 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FMblMg096561
	for perforce@freebsd.org; Fri, 15 Aug 2003 15:37:47 -0700 (PDT)
Date: Fri, 15 Aug 2003 15:37:47 -0700 (PDT)
Message-Id: <200308152237.h7FMblMg096561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Aug 2003 22:37:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=36226

Change 36226 by sam@sam_ebb on 2003/08/15 15:37:28

	slight mods to eliminate multiple references to constants like
	MSIZE; this simplifies switching the mbuf object size to a page
	for debugging

Affected files ...

.. //depot/projects/netperf/sys/kern/subr_mbuf.c#4 edit

Differences ...

==== //depot/projects/netperf/sys/kern/subr_mbuf.c#4 (text+ko) ====

@@ -391,8 +391,12 @@
 	    &(mb_list_mbuf.ml_maptop), mb_map_size);
 	mb_list_mbuf.ml_map->system_map = 1;
 	mb_list_mbuf.ml_mapfull = 0;
+#if 1
 	mb_list_mbuf.ml_objsize = MSIZE;
-	mb_list_mbuf.ml_objbucks = MBUF_BUCK_SZ / MSIZE;
+#else
+	mb_list_mbuf.ml_objsize = PAGE_SIZE;
+#endif
+	mb_list_mbuf.ml_objbucks = MBUF_BUCK_SZ / mb_list_mbuf.ml_objsize;
 	mb_list_mbuf.ml_wmhigh = &mbuf_hiwm;
 	mb_list_mbuf.ml_wmlow = &mbuf_lowm;
 
@@ -408,7 +412,7 @@
 	mb_list_clust.ml_map->system_map = 1;
 	mb_list_clust.ml_mapfull = 0;
 	mb_list_clust.ml_objsize = MCLBYTES;
-	mb_list_clust.ml_objbucks = CLUST_BUCK_SZ / MCLBYTES;
+	mb_list_clust.ml_objbucks = CLUST_BUCK_SZ / mb_list_clust.ml_objsize;
 	mb_list_clust.ml_wmhigh = &clust_hiwm;
 	mb_list_clust.ml_wmlow = &clust_lowm;
 
@@ -465,14 +469,14 @@
 	/*
 	 * Initialize general mbuf statistics.
 	 */
-	mbstat.m_msize = MSIZE;
-	mbstat.m_mclbytes = MCLBYTES;
+	mbstat.m_msize =  mb_list_mbuf.ml_objsize;
+	mbstat.m_mclbytes = mb_list_clust.ml_objsize;
 	mbstat.m_minclsize = MINCLSIZE;
 	mbstat.m_mlen = MLEN;
 	mbstat.m_mhlen = MHLEN;
 	mbstat.m_numtypes = MT_NTYPES;
-	mbstat.m_mbperbuck = MBUF_BUCK_SZ / MSIZE;
-	mbstat.m_clperbuck = CLUST_BUCK_SZ / MCLBYTES;
+	mbstat.m_mbperbuck = mb_list_mbuf.ml_objbucks;
+	mbstat.m_clperbuck = mb_list_clust.ml_objbucks;
 
 	/*
 	 * Allocate and initialize PCPU containers.