From owner-p4-projects@FreeBSD.ORG  Wed Jan 23 21:31:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C41516A469; Wed, 23 Jan 2008 21:31:04 +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 C38BD16A419
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:31:03 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DE3313C4F0
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:31:03 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0NLV3tC006267
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:31:03 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0NLV30s006264
	for perforce@freebsd.org; Wed, 23 Jan 2008 21:31:03 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 23 Jan 2008 21:31:03 GMT
Message-Id: <200801232131.m0NLV30s006264@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133949 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: Wed, 23 Jan 2008 21:31:04 -0000

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

Change 133949 by jb@jb_freebsd1 on 2008/01/23 21:30:58

	Further limit the amount of memory that we allocate in one chunk.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#21 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#21 (text) ====

@@ -10322,7 +10322,7 @@
 	 * ask to malloc, so let's place a limit here before trying
 	 * to do something that might well end in tears at bedtime.
 	 */
-	if (size > 32ULL * 1024 * 1024 * 1024)
+	if (size > physmem * PAGE_SIZE / (128 * (mp_maxid + 1)))
 		return(ENOMEM);
 
 	ASSERT(MUTEX_HELD(&dtrace_lock));