[src/trunk]: src/sys/sys opt_dtrace.h for KDTRACE_HOOKS. Use __nothing for e...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2ab440a6a6e2
branches:  trunk
changeset: 365612:2ab440a6a6e2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Aug 24 03:25:01 2018 +0000

description:
opt_dtrace.h for KDTRACE_HOOKS.  Use __nothing for empty expansion.

diffstat:

 sys/sys/sdt.h |  44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diffs (75 lines):

diff -r 1b2f540c71c9 -r 2ab440a6a6e2 sys/sys/sdt.h
--- a/sys/sys/sdt.h     Fri Aug 24 02:10:46 2018 +0000
+++ b/sys/sys/sdt.h     Fri Aug 24 03:25:01 2018 +0000
@@ -79,13 +79,18 @@
 
 #include <sys/cdefs.h>
 
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#endif
+
 #ifndef KDTRACE_HOOKS
 
 #define SDT_PROVIDER_DEFINE(prov)
 #define SDT_PROVIDER_DECLARE(prov)
 #define SDT_PROBE_DEFINE(prov, mod, func, name)
 #define SDT_PROBE_DECLARE(prov, mod, func, name)
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
+#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)       \
+       __nothing
 #define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)
 
 #define        SDT_PROBE_DEFINE0(prov, mod, func, name)
@@ -99,15 +104,19 @@
 #define        SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2,      \
     arg3, arg4, arg5, arg6)
 
-#define        SDT_PROBE0(prov, mod, func, name)
-#define        SDT_PROBE1(prov, mod, func, name, arg0)
-#define        SDT_PROBE2(prov, mod, func, name, arg0, arg1)
-#define        SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)
-#define        SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)
-#define        SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
-#define        SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5)
-#define        SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5,  \
-    arg6)
+#define        SDT_PROBE0(prov, mod, func, name)                       __nothing
+#define        SDT_PROBE1(prov, mod, func, name, arg0)                 __nothing
+#define        SDT_PROBE2(prov, mod, func, name, arg0, arg1)           __nothing
+#define        SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)     __nothing
+#define        SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)             \
+       __nothing
+#define        SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)       \
+       __nothing
+#define        SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5) \
+       __nothing
+#define        SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5, \
+    arg6)                                                                    \
+       __nothing
 
 #define        SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)
 #define        SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0)
@@ -125,13 +134,16 @@
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6,     \
     xarg6)
 
-#define        DTRACE_PROBE(name)
-#define        DTRACE_PROBE1(name, type0, arg0)
-#define        DTRACE_PROBE2(name, type0, arg0, type1, arg1)
-#define        DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)
-#define        DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)
+#define        DTRACE_PROBE(name)                                      __nothing
+#define        DTRACE_PROBE1(name, type0, arg0)                        __nothing
+#define        DTRACE_PROBE2(name, type0, arg0, type1, arg1)           __nothing
+#define        DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)            \
+       __nothing
+#define        DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)\
+       __nothing
 #define        DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,\
-    type4, arg4)
+    type4, arg4)                                                             \
+       __nothing
 
 #else