Date: Fri, 7 Aug 2015 19:56:22 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286420 - head/cddl/lib/libdtrace Message-ID: <201508071956.t77JuMla017058@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Fri Aug 7 19:56:22 2015 New Revision: 286420 URL: https://svnweb.freebsd.org/changeset/base/286420 Log: - Use an explicit "depends_on module kernel" guard in DTrace libraries that reference types defined in the kernel. Otherwise dtrace(1) expects to find CTF definitions for all referenced types, which is not very reasonable when it is being used in a build environment. This was previously worked around by adding "-x nolibs" to dtrace -h or -G invocations, but as of r283025, dtrace(1) actually handles dependencies properly, so this is no longer necessary. - Remove "pragma ident" directives from DTrace libraries, as they're being phased out upstream as well. Submitted by: Krister Johansen <Krister.Johansen@isilon.com> [1] MFC after: 1 week Sponsored by: EMC / Isilon Storage Division > Description of fields to fill in above: 76 columns --| > PR: If a GNATS PR is affected by the change. > Submitted by: If someone else sent in the change. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization. > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. M libdtrace/io.d M libdtrace/ip.d M libdtrace/nfs.d M libdtrace/nfssrv.d M libdtrace/psinfo.d M libdtrace/regs_x86.d M libdtrace/sched.d M libdtrace/siftr.d M libdtrace/tcp.d M libdtrace/udp.d Modified: head/cddl/lib/libdtrace/io.d head/cddl/lib/libdtrace/ip.d head/cddl/lib/libdtrace/nfs.d head/cddl/lib/libdtrace/nfssrv.d head/cddl/lib/libdtrace/psinfo.d head/cddl/lib/libdtrace/regs_x86.d head/cddl/lib/libdtrace/sched.d head/cddl/lib/libdtrace/siftr.d head/cddl/lib/libdtrace/tcp.d head/cddl/lib/libdtrace/udp.d Modified: head/cddl/lib/libdtrace/io.d ============================================================================== --- head/cddl/lib/libdtrace/io.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/io.d Fri Aug 7 19:56:22 2015 (r286420) @@ -25,8 +25,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - +#pragma D depends_on module kernel #pragma D depends_on provider io typedef struct devinfo { Modified: head/cddl/lib/libdtrace/ip.d ============================================================================== --- head/cddl/lib/libdtrace/ip.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/ip.d Fri Aug 7 19:56:22 2015 (r286420) @@ -25,6 +25,7 @@ * Copyright (c) 2013 Mark Johnston <markj@freebsd.org> */ +#pragma D depends_on module kernel #pragma D depends_on provider ip /* Modified: head/cddl/lib/libdtrace/nfs.d ============================================================================== --- head/cddl/lib/libdtrace/nfs.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/nfs.d Fri Aug 7 19:56:22 2015 (r286420) @@ -30,6 +30,7 @@ #pragma D depends_on library ip.d #pragma D depends_on library net.d +#pragma D depends_on module kernel #pragma D depends_on module nfs typedef struct nfsv4opinfo { Modified: head/cddl/lib/libdtrace/nfssrv.d ============================================================================== --- head/cddl/lib/libdtrace/nfssrv.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/nfssrv.d Fri Aug 7 19:56:22 2015 (r286420) @@ -30,7 +30,8 @@ #pragma D depends_on library ip.d #pragma D depends_on library net.d -#pragma D depends_on module nfs.d +#pragma D depends_on library nfs.d +#pragma D depends_on module kernel #pragma D depends_on module nfssrv #pragma D binding "1.5" translator Modified: head/cddl/lib/libdtrace/psinfo.d ============================================================================== --- head/cddl/lib/libdtrace/psinfo.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/psinfo.d Fri Aug 7 19:56:22 2015 (r286420) @@ -28,6 +28,8 @@ * Use is subject to license terms. */ +#pragma D depends_on module kernel + typedef struct psinfo { int pr_nlwp; /* number of threads */ pid_t pr_pid; /* unique process id */ Modified: head/cddl/lib/libdtrace/regs_x86.d ============================================================================== --- head/cddl/lib/libdtrace/regs_x86.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/regs_x86.d Fri Aug 7 19:56:22 2015 (r286420) @@ -28,8 +28,6 @@ * Use is subject to license terms. */ -#pragma ident "@(#)regs.d.in 1.1 04/09/28 SMI" - inline int R_GS = 0; #pragma D binding "1.0" R_GS inline int R_FS = 1; Modified: head/cddl/lib/libdtrace/sched.d ============================================================================== --- head/cddl/lib/libdtrace/sched.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/sched.d Fri Aug 7 19:56:22 2015 (r286420) @@ -27,9 +27,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#pragma D depends_on module unix +#pragma D depends_on module kernel #pragma D depends_on provider sched struct cpuinfo { Modified: head/cddl/lib/libdtrace/siftr.d ============================================================================== --- head/cddl/lib/libdtrace/siftr.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/siftr.d Fri Aug 7 19:56:22 2015 (r286420) @@ -21,6 +21,7 @@ * $FreeBSD$ */ +#pragma D depends_on module kernel #pragma D depends_on module siftr #pragma D depends_on provider tcp Modified: head/cddl/lib/libdtrace/tcp.d ============================================================================== --- head/cddl/lib/libdtrace/tcp.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/tcp.d Fri Aug 7 19:56:22 2015 (r286420) @@ -26,6 +26,7 @@ */ #pragma D depends_on library ip.d +#pragma D depends_on module kernel #pragma D depends_on provider tcp /* Modified: head/cddl/lib/libdtrace/udp.d ============================================================================== --- head/cddl/lib/libdtrace/udp.d Fri Aug 7 18:40:44 2015 (r286419) +++ head/cddl/lib/libdtrace/udp.d Fri Aug 7 19:56:22 2015 (r286420) @@ -26,6 +26,7 @@ */ #pragma D depends_on library ip.d +#pragma D depends_on module kernel #pragma D depends_on provider udp /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508071956.t77JuMla017058>