From owner-svn-src-all@FreeBSD.ORG Fri May 18 16:40:16 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C8B110656B4; Fri, 18 May 2012 16:40:16 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4828C8FC0C; Fri, 18 May 2012 16:40:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4IGeG4Q063492; Fri, 18 May 2012 16:40:16 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4IGeGLM063486; Fri, 18 May 2012 16:40:16 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <201205181640.q4IGeGLM063486@svn.freebsd.org> From: "George V. Neville-Neil" Date: Fri, 18 May 2012 16:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235613 - in head: etc/mtree share share/dtrace share/dtrace/toolkit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2012 16:40:16 -0000 Author: gnn Date: Fri May 18 16:40:15 2012 New Revision: 235613 URL: http://svn.freebsd.org/changeset/base/235613 Log: Add support for our own DTrace scripts and those from the DTraceToolkit to the build system. FreeBSD written scripts are stored in src/share and the toolkit scripts are brought from the cddl directory into a working tree via install. MFC after: 2 weeks Added: head/share/dtrace/ head/share/dtrace/Makefile (contents, props changed) head/share/dtrace/README (contents, props changed) head/share/dtrace/toolkit/ head/share/dtrace/toolkit/Makefile (contents, props changed) Modified: head/etc/mtree/BSD.usr.dist head/share/Makefile Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Fri May 18 16:16:47 2012 (r235612) +++ head/etc/mtree/BSD.usr.dist Fri May 18 16:40:15 2012 (r235613) @@ -200,6 +200,10 @@ .. .. .. + dtrace + toolkit + .. + .. examples BSD_daemon .. Modified: head/share/Makefile ============================================================================== --- head/share/Makefile Fri May 18 16:16:47 2012 (r235612) +++ head/share/Makefile Fri May 18 16:40:15 2012 (r235613) @@ -8,6 +8,7 @@ SUBDIR= ${_colldef} \ ${_dict} \ ${_doc} \ + dtrace \ ${_examples} \ ${_i18n} \ ${_man} \ Added: head/share/dtrace/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/dtrace/Makefile Fri May 18 16:40:15 2012 (r235613) @@ -0,0 +1,21 @@ +# $FreeBSD$ +# +# Hand installing our scripts and optionally (based on MK_CDDL) installing +# the DTraceToolkit. +# + +.include + +SUBDIR= ${_toolkit} + +.if ${MK_CDDL} != "no" +_toolkit= toolkit +.endif + +SCRIPTS= nfsclienttime + +SCRIPTSDIR= ${SHAREDIR}/dtrace/ + +NO_OBJ= + +.include Added: head/share/dtrace/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/dtrace/README Fri May 18 16:40:15 2012 (r235613) @@ -0,0 +1,11 @@ +$FreeBSD$ + +This directory contains scripts for use with the DTrace system. The +toolkit/ directory contains the latest vendor import of Brendan +Gregg's DTRaceToolkit while all the other files and directories +contain code generated by the FreeBSD Project for use with DTrace on +FreeBSD. + +NOTE: Do not add new scripts to the DTraceToolkit contained in this +directory. New DTraceToolkit scripts should be send to the maintainer +of the toolkit and then brought back into FreeBSD via future vendor imports. Added: head/share/dtrace/toolkit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/dtrace/toolkit/Makefile Fri May 18 16:40:15 2012 (r235613) @@ -0,0 +1,17 @@ +#$FreeBSD$ +# +# Install scripts from the DTraceToolkit +# +DTRACETOOLKIT= ../../../cddl/contrib/dtracetoolkit + +SCRIPTS= ${DTRACETOOLKIT}/execsnoop \ + ${DTRACETOOLKIT}/hotuser \ + ${DTRACETOOLKIT}/hotkernel \ + ${DTRACETOOLKIT}/opensnoop \ + ${DTRACETOOLKIT}/procsystime \ + +SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit + +NO_OBJ= + +.include