svn commit: r271802 - in head: share/man/man9 sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/modules/zfs

[Steven Hartland]

Author: smh
Date: Thu Sep 18 20:00:36 2014
New Revision: 271802
URL: http://svnweb.freebsd.org/changeset/base/271802

Log:
  Add dtrace probe support for zfs SET_ERROR(..)
  
  MFC after:	1 week
  Sponsored by:	Multiplay

Added:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c   (contents, props changed)
Modified:
  head/share/man/man9/SDT.9
  head/sys/cddl/compat/opensolaris/sys/sdt.h
  head/sys/modules/zfs/Makefile

Modified: head/share/man/man9/SDT.9
==============================================================================
--- head/share/man/man9/SDT.9	Thu Sep 18 19:57:13 2014	(r271801)
+++ head/share/man/man9/SDT.9	Thu Sep 18 20:00:36 2014	(r271802)
@@ -24,13 +24,16 @@
 .\"
 .\" $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/types.h
+.In sys/queue.h
 .In sys/sdt.h
 .Fn SDT_PROVIDER_DECLARE prov
 .Fn SDT_PROVIDER_DEFINE prov

Added: head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c	Thu Sep 18 20:00:36 2014	(r271802)
@@ -0,0 +1,37 @@
+/*-
+ * 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/types.h>
+#include <sys/queue.h>
+#include <sys/sdt.h>
+
+SDT_PROBE_DEFINE1(sdt, , , set__error, "int");

Modified: head/sys/cddl/compat/opensolaris/sys/sdt.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/sdt.h	Thu Sep 18 19:57:13 2014	(r271801)
+++ head/sys/cddl/compat/opensolaris/sys/sdt.h	Thu Sep 18 20:00:36 2014	(r271802)
@@ -31,6 +31,15 @@
 
 #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: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile	Thu Sep 18 19:57:13 2014	(r271801)
+++ head/sys/modules/zfs/Makefile	Thu Sep 18 20:00:36 2014	(r271802)
@@ -21,6 +21,7 @@ SRCS+=	u8_textprep.c
 
 .PATH:	${SYSDIR}/cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_acl.c
+SRCS+=	opensolaris_dtrace.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
 SRCS+=	opensolaris_lookup.c