From owner-svn-src-all@FreeBSD.ORG Thu May 15 00:52:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D6056496;
Thu, 15 May 2014 00:52:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B48AC2D56;
Thu, 15 May 2014 00:52:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F0qI2S058202;
Thu, 15 May 2014 00:52:18 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4F0qI8U058199;
Thu, 15 May 2014 00:52:18 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201405150052.s4F0qI8U058199@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 15 May 2014 00:52:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r266102 - in stable/10/sys/cddl:
contrib/opensolaris/uts/common/dtrace dev/dtrace
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 May 2014 00:52:19 -0000
Author: markj
Date: Thu May 15 00:52:17 2014
New Revision: 266102
URL: http://svnweb.freebsd.org/changeset/base/266102
Log:
MFC r262665:
Expose a few DTrace parameters as sysctls under kern.dtrace and add
descriptions for several existing sysctls.
PR: 187027
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
stable/10/sys/cddl/dev/dtrace/dtrace_ioctl.c
stable/10/sys/cddl/dev/dtrace/dtrace_sysctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu May 15 00:50:57 2014 (r266101)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu May 15 00:52:17 2014 (r266102)
@@ -300,7 +300,8 @@ static kmutex_t dtrace_meta_lock; /* me
#define PRIV_PROC_ZONE (1 << 5)
#define PRIV_ALL ~0
-SYSCTL_NODE(_debug, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace Information");
+SYSCTL_DECL(_debug_dtrace);
+SYSCTL_DECL(_kern_dtrace);
#endif
#if defined(sun)
Modified: stable/10/sys/cddl/dev/dtrace/dtrace_ioctl.c
==============================================================================
--- stable/10/sys/cddl/dev/dtrace/dtrace_ioctl.c Thu May 15 00:50:57 2014 (r266101)
+++ stable/10/sys/cddl/dev/dtrace/dtrace_ioctl.c Thu May 15 00:52:17 2014 (r266102)
@@ -23,7 +23,8 @@
*/
static int dtrace_verbose_ioctl;
-SYSCTL_INT(_debug_dtrace, OID_AUTO, verbose_ioctl, CTLFLAG_RW, &dtrace_verbose_ioctl, 0, "");
+SYSCTL_INT(_debug_dtrace, OID_AUTO, verbose_ioctl, CTLFLAG_RW,
+ &dtrace_verbose_ioctl, 0, "log DTrace ioctls");
#define DTRACE_IOCTL_PRINTF(fmt, ...) if (dtrace_verbose_ioctl) printf(fmt, ## __VA_ARGS__ )
Modified: stable/10/sys/cddl/dev/dtrace/dtrace_sysctl.c
==============================================================================
--- stable/10/sys/cddl/dev/dtrace/dtrace_sysctl.c Thu May 15 00:50:57 2014 (r266101)
+++ stable/10/sys/cddl/dev/dtrace/dtrace_sysctl.c Thu May 15 00:52:17 2014 (r266102)
@@ -22,6 +22,8 @@
*
*/
+SYSCTL_NODE(_debug, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace debug parameters");
+
int dtrace_debug = 0;
TUNABLE_INT("debug.dtrace.debug", &dtrace_debug);
SYSCTL_INT(_debug_dtrace, OID_AUTO, debug, CTLFLAG_RW, &dtrace_debug, 0, "");
@@ -78,5 +80,12 @@ sysctl_dtrace_providers(SYSCTL_HANDLER_A
}
SYSCTL_PROC(_debug_dtrace, OID_AUTO, providers, CTLTYPE_STRING | CTLFLAG_RD,
- 0, 0, sysctl_dtrace_providers, "A", "");
+ 0, 0, sysctl_dtrace_providers, "A", "available DTrace providers");
+
+SYSCTL_NODE(_kern, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace parameters");
+
+SYSCTL_LONG(_kern_dtrace, OID_AUTO, dof_maxsize, CTLFLAG_RW,
+ &dtrace_dof_maxsize, 0, "largest allowed DOF table");
+SYSCTL_LONG(_kern_dtrace, OID_AUTO, helper_actions_max, CTLFLAG_RW,
+ &dtrace_helper_actions_max, 0, "maximum number of allowed helper actions");