From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 22:17:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4A38106566B; Thu, 23 Jul 2009 22:17:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A40AE106566C
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:17:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 92D5A8FC0C
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:17:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6NMHwBB095152
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:17:58 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6NMHwPv095150
	for perforce@freebsd.org; Thu, 23 Jul 2009 22:17:58 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 23 Jul 2009 22:17:58 GMT
Message-Id: <200907232217.n6NMHwPv095150@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166481 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 23 Jul 2009 22:18:00 -0000

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

Change 166481 by andre@andre_t61 on 2009/07/23 22:17:46

	Add uma_zone_get_max() reporting the actual rounded up maximum
	of items in a zone (if limited by uma_zone_set_max).

Affected files ...

.. //depot/projects/tcp_reass/vm/uma.h#5 edit
.. //depot/projects/tcp_reass/vm/uma_core.c#6 edit

Differences ...

==== //depot/projects/tcp_reass/vm/uma.h#5 (text+ko) ====

@@ -451,7 +451,8 @@
  * Sets a high limit on the number of items allowed in a zone
  *
  * Arguments:
- *	zone  The zone to limit
+ *	zone	The zone to limit
+ *	nitems 	The maximum number of items (will be rounded up to slab (page) size)
  *
  * Returns:
  *	Nothing
@@ -459,6 +460,18 @@
 void uma_zone_set_max(uma_zone_t zone, int nitems);
 
 /*
+ * Returns the high limit on the number of items allowed in a zone
+ *
+ * Arguments:
+ *	zone	The zone to report
+ *
+ * Returns:
+ *	0	unlimited
+ *	>0	The effective maximum number of items allowed
+ */
+int uma_zone_get_max(uma_zone_t zone);
+
+/*
  * The following two routines (uma_zone_set_init/fini)
  * are used to set the backend init/fini pair which acts on an
  * object as it becomes allocated and is placed in a slab within

==== //depot/projects/tcp_reass/vm/uma_core.c#6 (text+ko) ====

@@ -2799,6 +2799,24 @@
 }
 
 /* See uma.h */
+int
+uma_zone_get_max(uma_zone_t zone)
+{
+	int items;
+	uma_keg_t keg;
+
+	ZONE_LOCK(zone);
+	keg = zone_first_keg(zone);
+	if (keg->uk_maxpages > 0)
+		items = keg->uk_maxpages * keg->uk_ipers;
+	else
+		items = 0;
+	ZONE_UNLOCK(zone);
+
+	return (items);
+}
+
+/* See uma.h */
 void
 uma_zone_set_init(uma_zone_t zone, uma_init uminit)
 {