Date: Fri, 17 Jan 2014 10:34:02 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260813 - in stable/10/sys: kern modules/dtrace modules/dtrace/dtio modules/dtrace/dtraceall Message-ID: <201401171034.s0HAY2lZ021083@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Jan 17 10:34:01 2014 New Revision: 260813 URL: http://svnweb.freebsd.org/changeset/base/260813 Log: MFC r257037: Redefine the io provider using the SDT(9) macros MFC slacker: markj Deleted: stable/10/sys/kern/dtio_kdtrace.c stable/10/sys/modules/dtrace/dtio/ Modified: stable/10/sys/kern/subr_devstat.c stable/10/sys/modules/dtrace/Makefile stable/10/sys/modules/dtrace/dtraceall/dtraceall.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/subr_devstat.c ============================================================================== --- stable/10/sys/kern/subr_devstat.c Fri Jan 17 10:23:46 2014 (r260812) +++ stable/10/sys/kern/subr_devstat.c Fri Jan 17 10:34:01 2014 (r260813) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bio.h> #include <sys/devicestat.h> +#include <sys/sdt.h> #include <sys/sysctl.h> #include <sys/malloc.h> #include <sys/lock.h> @@ -46,57 +47,21 @@ __FBSDID("$FreeBSD$"); #include <machine/atomic.h> -#ifdef KDTRACE_HOOKS -#include <sys/dtrace_bsd.h> +SDT_PROVIDER_DEFINE(io); -dtrace_io_start_probe_func_t dtrace_io_start_probe; -dtrace_io_done_probe_func_t dtrace_io_done_probe; -dtrace_io_wait_start_probe_func_t dtrace_io_wait_start_probe; -dtrace_io_wait_done_probe_func_t dtrace_io_wait_done_probe; - -uint32_t dtio_start_id; -uint32_t dtio_done_id; -uint32_t dtio_wait_start_id; -uint32_t dtio_wait_done_id; - -#define DTRACE_DEVSTAT_START() \ - if (dtrace_io_start_probe != NULL) \ - (*dtrace_io_start_probe)(dtio_start_id, NULL, ds); - -#define DTRACE_DEVSTAT_BIO_START() \ - if (dtrace_io_start_probe != NULL) \ - (*dtrace_io_start_probe)(dtio_start_id, bp, ds); - -#define DTRACE_DEVSTAT_DONE() \ - if (dtrace_io_done_probe != NULL) \ - (*dtrace_io_done_probe)(dtio_done_id, NULL, ds); - -#define DTRACE_DEVSTAT_BIO_DONE() \ - if (dtrace_io_done_probe != NULL) \ - (*dtrace_io_done_probe)(dtio_done_id, bp, ds); - -#define DTRACE_DEVSTAT_WAIT_START() \ - if (dtrace_io_wait_start_probe != NULL) \ - (*dtrace_io_wait_start_probe)(dtio_wait_start_id, NULL, ds); - -#define DTRACE_DEVSTAT_WAIT_DONE() \ - if (dtrace_io_wait_done_probe != NULL) \ - (*dtrace_io_wait_done_probe)(dtio_wait_done_id, NULL, ds); - -#else /* ! KDTRACE_HOOKS */ - -#define DTRACE_DEVSTAT_START() - -#define DTRACE_DEVSTAT_BIO_START() - -#define DTRACE_DEVSTAT_DONE() - -#define DTRACE_DEVSTAT_BIO_DONE() - -#define DTRACE_DEVSTAT_WAIT_START() - -#define DTRACE_DEVSTAT_WAIT_DONE() -#endif /* KDTRACE_HOOKS */ +SDT_PROBE_DEFINE2(io, , , start, start, "struct bio *", "struct devstat *"); +SDT_PROBE_DEFINE2(io, , , done, done, "struct bio *", "struct devstat *"); +SDT_PROBE_DEFINE2(io, , , wait_start, wait-start, "struct bio *", + "struct devstat *"); +SDT_PROBE_DEFINE2(io, , , wait_done, wait-done, "struct bio *", + "struct devstat *"); + +#define DTRACE_DEVSTAT_START() SDT_PROBE2(io, , , start, NULL, ds) +#define DTRACE_DEVSTAT_BIO_START() SDT_PROBE2(io, , , start, bp, ds) +#define DTRACE_DEVSTAT_DONE() SDT_PROBE2(io, , , done, NULL, ds) +#define DTRACE_DEVSTAT_BIO_DONE() SDT_PROBE2(io, , , done, bp, ds) +#define DTRACE_DEVSTAT_WAIT_START() SDT_PROBE2(io, , , wait_start, NULL, ds) +#define DTRACE_DEVSTAT_WAIT_DONE() SDT_PROBE2(io, , , wait_done, NULL, ds) static int devstat_num_devs; static long devstat_generation = 1; Modified: stable/10/sys/modules/dtrace/Makefile ============================================================================== --- stable/10/sys/modules/dtrace/Makefile Fri Jan 17 10:23:46 2014 (r260812) +++ stable/10/sys/modules/dtrace/Makefile Fri Jan 17 10:34:01 2014 (r260813) @@ -9,7 +9,6 @@ SUBDIR= dtmalloc \ dtrace \ dtraceall \ dtrace_test \ - dtio \ lockstat \ profile \ prototype \ Modified: stable/10/sys/modules/dtrace/dtraceall/dtraceall.c ============================================================================== --- stable/10/sys/modules/dtrace/dtraceall/dtraceall.c Fri Jan 17 10:23:46 2014 (r260812) +++ stable/10/sys/modules/dtrace/dtraceall/dtraceall.c Fri Jan 17 10:34:01 2014 (r260813) @@ -66,7 +66,6 @@ MODULE_VERSION(dtraceall, 1); MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1); MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1); MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1); -MODULE_DEPEND(dtraceall, dtio, 1, 1, 1); MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); #if defined(NFSCLIENT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401171034.s0HAY2lZ021083>