From owner-p4-projects@FreeBSD.ORG  Thu Jan 24 22:20:18 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A71A616A41A; Thu, 24 Jan 2008 22:20:18 +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 6C5AA16A418
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:20:18 +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 5AD8913C458
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:20:18 +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 m0OMKIBI022557
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:20:18 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0OMKIQK022554
	for perforce@freebsd.org; Thu, 24 Jan 2008 22:20:18 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 24 Jan 2008 22:20:18 GMT
Message-Id: <200801242220.m0OMKIQK022554@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 134029 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, 24 Jan 2008 22:20:18 -0000

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

Change 134029 by jb@jb_freebsd1 on 2008/01/24 22:19:58

	Use the new kern.smp.maxid syscall to determine if the requested
	CPU is available. It's a bit crude, but we don't take CPUs 
	offline anyway.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#15 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#15 (text) ====

@@ -40,6 +40,8 @@
 #include <ctype.h>
 #if defined(sun)
 #include <alloca.h>
+#else
+#include <sys/sysctl.h>
 #endif
 #include <assert.h>
 #include <libgen.h>
@@ -499,12 +501,18 @@
 {
 	const dtrace_vector_t *v = dtp->dt_vector;
 
-	if (v == NULL)
+	if (v == NULL) {
 #if defined(sun)
 		return (p_online(cpu, P_STATUS));
 #else
-		return (cpu == 0 ? 1:-1);
+		int maxid = 0;
+		size_t len = sizeof(maxid);
+		if (sysctlbyname("kern.smp.maxid", &maxid, &len, NULL, 0) != 0)
+			return (cpu == 0 ? 1 : -1);
+		else
+			return (cpu <= maxid ? 1 : -1);
 #endif
+	}
 
 	return (v->dtv_status(dtp->dt_varg, cpu));
 }
@@ -721,6 +729,11 @@
 {
 	void *data;
 
+	if (size > 16 * 1024 * 1024) {
+		(void) dt_set_errno(dtp, EDT_NOMEM);
+		return (NULL);
+	}
+
 	if ((data = malloc(size)) == NULL)
 		(void) dt_set_errno(dtp, EDT_NOMEM);
 	else
@@ -734,6 +747,11 @@
 {
 	void *data;
 
+	if (size > 16 * 1024 * 1024) {
+		(void) dt_set_errno(dtp, EDT_NOMEM);
+		return (NULL);
+	}
+
 	if ((data = malloc(size)) == NULL)
 		(void) dt_set_errno(dtp, EDT_NOMEM);