diff options
author | smh <smh@FreeBSD.org> | 2014-10-10 00:26:00 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2014-10-10 00:26:00 +0000 |
commit | 7e6d3acc4d6d4e297610ebdd45611d56022dd7ad (patch) | |
tree | d579477347b26da8734c99faa831dcac7a2edcf4 | |
parent | 227e0641478d6ec14ae84c216f886f45300c123d (diff) | |
download | FreeBSD-src-7e6d3acc4d6d4e297610ebdd45611d56022dd7ad.zip FreeBSD-src-7e6d3acc4d6d4e297610ebdd45611d56022dd7ad.tar.gz |
MFC r271802:
Add dtrace probe support for zfs SET_ERROR(..)
MFC r271873:
Fix static kernel build with options ZFS
MFC r271819:
Remove sys/types.h include as per style (9)
Sponsored by: Multiplay
-rw-r--r-- | share/man/man9/SDT.9 | 4 | ||||
-rw-r--r-- | sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c | 36 | ||||
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/sdt.h | 11 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/modules/zfs/Makefile | 1 |
5 files changed, 51 insertions, 2 deletions
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9 index 1f821cf..bc31fc1 100644 --- a/share/man/man9/SDT.9 +++ b/share/man/man9/SDT.9 @@ -24,13 +24,15 @@ .\" .\" $FreeBSD$ .\" -.Dd August 17, 2013 +.Dd September 18, 2014 .Dt SDT 9 .Os .Sh NAME .Nm SDT .Nd a DTrace framework for adding statically-defined tracing probes .Sh SYNOPSIS +.In sys/param.h +.In sys/queue.h .In sys/sdt.h .Fn SDT_PROVIDER_DECLARE prov .Fn SDT_PROVIDER_DEFINE prov diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c b/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c new file mode 100644 index 0000000..4d54b53 --- /dev/null +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c @@ -0,0 +1,36 @@ +/*- + * Copyright 2014 The FreeBSD Project. + * All rights reserved. + * + * This software was developed by Steven Hartland. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/queue.h> +#include <sys/sdt.h> + +SDT_PROBE_DEFINE1(sdt, , , set__error, "int"); diff --git a/sys/cddl/compat/opensolaris/sys/sdt.h b/sys/cddl/compat/opensolaris/sys/sdt.h index f03f6ab..51f0790 100644 --- a/sys/cddl/compat/opensolaris/sys/sdt.h +++ b/sys/cddl/compat/opensolaris/sys/sdt.h @@ -34,6 +34,15 @@ #endif #include_next <sys/sdt.h> -#define SET_ERROR(err) (err) +#ifdef KDTRACE_HOOKS +SDT_PROBE_DECLARE(sdt, , , set__error); + +#define SET_ERROR(err) \ + ((sdt_sdt___set__error->id ? \ + (*sdt_probe_func)(sdt_sdt___set__error->id, \ + (uintptr_t)err, 0, 0, 0, 0) : 0), err) +#else +#define SET_ERROR(err) (err) +#endif #endif /* _OPENSOLARIS_SYS_SDT_H_ */ diff --git a/sys/conf/files b/sys/conf/files index 4df397c..49527a7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -111,6 +111,7 @@ cddl/compat/opensolaris/kern/opensolaris_misc.c optional zfs compile-with "${ cddl/compat/opensolaris/kern/opensolaris_sunddi.c optional zfs compile-with "${ZFS_C}" # zfs specific cddl/compat/opensolaris/kern/opensolaris_acl.c optional zfs compile-with "${ZFS_C}" +cddl/compat/opensolaris/kern/opensolaris_dtrace.c optional zfs compile-with "${ZFS_C}" cddl/compat/opensolaris/kern/opensolaris_kobj.c optional zfs compile-with "${ZFS_C}" cddl/compat/opensolaris/kern/opensolaris_kstat.c optional zfs compile-with "${ZFS_C}" cddl/compat/opensolaris/kern/opensolaris_lookup.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index e8f8193..ea8bd45 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -25,6 +25,7 @@ SRCS+= u8_textprep.c .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern SRCS+= opensolaris_acl.c +SRCS+= opensolaris_dtrace.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c SRCS+= opensolaris_lookup.c |