summaryrefslogtreecommitdiffstats
path: root/sys/modules/dtrace
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2015-07-19 22:14:09 +0000
committermarkj <markj@FreeBSD.org>2015-07-19 22:14:09 +0000
commitfb4cb70b7d3b8771f051726851f280a5684263db (patch)
treef4dbaff3eee7463b0bc4a1e309dee981d6aaba59 /sys/modules/dtrace
parent34ac7bd4d308634de1d2248b083ab98fc3d7ad28 (diff)
downloadFreeBSD-src-fb4cb70b7d3b8771f051726851f280a5684263db.zip
FreeBSD-src-fb4cb70b7d3b8771f051726851f280a5684263db.tar.gz
Implement the lockstat provider using SDT(9) instead of the custom provider
in lockstat.ko. This means that lockstat probes now have typed arguments and will utilize SDT probe hot-patching support when it arrives. Reviewed by: gnn Differential Revision: https://reviews.freebsd.org/D2993
Diffstat (limited to 'sys/modules/dtrace')
-rw-r--r--sys/modules/dtrace/Makefile1
-rw-r--r--sys/modules/dtrace/Makefile.inc2
-rw-r--r--sys/modules/dtrace/dtraceall/dtraceall.c1
-rw-r--r--sys/modules/dtrace/lockstat/Makefile18
4 files changed, 0 insertions, 22 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index d7540d9..7be4c32 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -7,7 +7,6 @@ SUBDIR= dtmalloc \
dtrace \
dtraceall \
dtrace_test \
- lockstat \
profile \
prototype \
sdt \
diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc
index 204e046..3520c38 100644
--- a/sys/modules/dtrace/Makefile.inc
+++ b/sys/modules/dtrace/Makefile.inc
@@ -6,7 +6,6 @@ load :
-kldload dtrace
.if ${MACHINE_CPUARCH} == "i386"
-kldload sdt
- -kldload lockstat
-kldload fbt
-kldload prototype
.endif
@@ -20,7 +19,6 @@ unload :
.if ${MACHINE_CPUARCH} == "i386"
-kldunload prototype
-kldunload fbt
- -kldunload lockstat
-kldunload sdt
.endif
-kldunload dtrace
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index ecab4f7..754c1c4 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -76,7 +76,6 @@ MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
#if defined(__amd64__) || defined(__i386__)
MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1);
#endif
-MODULE_DEPEND(dtraceall, lockstat, 1, 1, 1);
MODULE_DEPEND(dtraceall, sdt, 1, 1, 1);
MODULE_DEPEND(dtraceall, systrace, 1, 1, 1);
#if defined(COMPAT_FREEBSD32)
diff --git a/sys/modules/dtrace/lockstat/Makefile b/sys/modules/dtrace/lockstat/Makefile
deleted file mode 100644
index 8780dd8..0000000
--- a/sys/modules/dtrace/lockstat/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-SYSDIR?= ${.CURDIR}/../../..
-
-.PATH: ${SYSDIR}/cddl/dev/lockstat
-
-KMOD= lockstat
-SRCS= lockstat.c
-
-SRCS+= vnode_if.h
-
-CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \
- -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \
- -I${SYSDIR}
-
-.include <bsd.kmod.mk>
-
-CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
OpenPOWER on IntegriCloud