Author: smh
Date: Fri Oct 10 00:26:00 2014
New Revision: 272877
URL: https://svnweb.freebsd.org/changeset/base/272877
Log:
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
Added:
stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
- copied, changed from r271802,
head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
Modified:
stable/10/share/man/man9/SDT.9
stable/10/sys/cddl/compat/opensolaris/sys/sdt.h
stable/10/sys/conf/files
stable/10/sys/modules/zfs/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man9/SDT.9
==============================================================================
--- stable/10/share/man/man9/SDT.9 Fri Oct 10 00:24:45 2014
(r272876)
+++ stable/10/share/man/man9/SDT.9 Fri Oct 10 00:26:00 2014
(r272877)
@@ -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
Copied and modified:
stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c (from r271802,
head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c)
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c Thu Sep 18
20:00:36 2014 (r271802, copy source)
+++ stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c Fri Oct
10 00:26:00 2014 (r272877)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sdt.h>
Modified: stable/10/sys/cddl/compat/opensolaris/sys/sdt.h
==============================================================================
--- stable/10/sys/cddl/compat/opensolaris/sys/sdt.h Fri Oct 10 00:24:45
2014 (r272876)
+++ stable/10/sys/cddl/compat/opensolaris/sys/sdt.h Fri Oct 10 00:26:00
2014 (r272877)
@@ -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_ */
Modified: stable/10/sys/conf/files
==============================================================================
--- stable/10/sys/conf/files Fri Oct 10 00:24:45 2014 (r272876)
+++ stable/10/sys/conf/files Fri Oct 10 00:26:00 2014 (r272877)
@@ -111,6 +111,7 @@ cddl/compat/opensolaris/kern/opensolaris
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}"
Modified: stable/10/sys/modules/zfs/Makefile
==============================================================================
--- stable/10/sys/modules/zfs/Makefile Fri Oct 10 00:24:45 2014
(r272876)
+++ stable/10/sys/modules/zfs/Makefile Fri Oct 10 00:26:00 2014
(r272877)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
