mark ZoL custom 'dtrace' macros ifdef __linux__

Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
openzfs · Jul 9, 2019 · aa310e8 · aa310e8
1 parent cf67162
commit aa310e8
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 6 deletions.
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
@@ -63,8 +63,8 @@
 #include <sys/sunddi.h>
 #include <sys/ctype.h>
 #include <sys/disp.h>
-#include <sys/trace.h>
 #if defined(__linux__)
+#include <sys/trace.h>
 #include <sys/procfs_list.h>
 #include <linux/dcache_compat.h>
 #include <linux/utsname_compat.h>

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
@@ -297,6 +297,7 @@
 #include <sys/vmsystm.h>
 #include <sys/zpl.h>
 #include <linux/page_compat.h>
+#include <sys/trace_arc.h>
 #elif defined(__FreeBSD__)
 #include <sys/eventhandler.h>
 #endif
@@ -306,7 +307,6 @@
 #include <sys/zthr.h>
 #include <zfs_fletcher.h>
 #include <sys/arc_impl.h>
-#include <sys/trace_arc.h>
 #include <sys/aggsum.h>
 #include <sys/cityhash.h>
 

diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
@@ -44,7 +44,9 @@
 #include <sys/zfeature.h>
 #include <sys/blkptr.h>
 #include <sys/range_tree.h>
+#ifdef __linux__
 #include <sys/trace_dbuf.h>
+#endif
 #include <sys/callb.h>
 #include <sys/abd.h>
 #include <sys/vdev.h>

diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
@@ -49,7 +49,9 @@
 #include <sys/sa.h>
 #include <sys/zfeature.h>
 #include <sys/abd.h>
+#ifdef __linux__
 #include <sys/trace_dmu.h>
+#endif
 #include <sys/zfs_rlock.h>
 #ifdef _KERNEL
 #include <sys/vmsystm.h>

diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
@@ -37,7 +37,9 @@
 #include <sys/sa.h>
 #include <sys/sa_impl.h>
 #include <sys/zfs_context.h>
+#ifdef __linux__
 #include <sys/trace_dmu.h>
+#endif
 
 typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
     uint64_t arg1, uint64_t arg2);

diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
@@ -37,8 +37,12 @@
 #include <sys/zio.h>
 #include <sys/dmu_zfetch.h>
 #include <sys/range_tree.h>
-#include <sys/trace_dnode.h>
 #include <sys/zfs_project.h>
+#include <sys/sdt.h>
+
+#ifdef __linux__
+#include <sys/trace_dnode.h>
+#endif
 
 dnode_stats_t dnode_stats = {
 	{ "dnode_hold_dbuf_hold",		KSTAT_DATA_UINT64 },

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
@@ -48,9 +48,13 @@
 #include <sys/zfeature.h>
 #include <sys/zil_impl.h>
 #include <sys/dsl_userhold.h>
-#include <sys/trace_txg.h>
+#include <sys/sdt.h>
 #include <sys/mmp.h>
 
+#ifdef __linux__
+#include <sys/trace_txg.h>
+#endif
+
 /*
  * ZFS Write Throttle
  * ------------------

diff --git a/module/zfs/multilist.c b/module/zfs/multilist.c
@@ -18,7 +18,9 @@
 
 #include <sys/zfs_context.h>
 #include <sys/multilist.h>
+#ifdef __linux__
 #include <sys/trace_multilist.h>
+#endif
 
 /* needed for spa_get_random() */
 #include <sys/spa.h>

diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c
@@ -28,7 +28,9 @@
 
 #include <sys/refcount.h>
 #include <sys/rrwlock.h>
+#ifdef __linux__
 #include <sys/trace_rrwlock.h>
+#endif
 
 /*
  * This file contains the implementation of a re-entrant read

diff --git a/module/zfs/trace.c b/module/zfs/trace.c
@@ -38,6 +38,7 @@
 #include <sys/zil_impl.h>
 #include <sys/zrlock.h>
 
+#ifdef __linux__
 #define	CREATE_TRACE_POINTS
 #include <sys/trace.h>
 #include <sys/trace_acl.h>
@@ -52,3 +53,4 @@
 #include <sys/trace_zil.h>
 #include <sys/trace_zio.h>
 #include <sys/trace_zrlock.h>
+#endif
diff --git a/module/zfs/txg.c b/module/zfs/txg.c
@@ -33,7 +33,9 @@
 #include <sys/dsl_scan.h>
 #include <sys/zil.h>
 #include <sys/callb.h>
+#ifdef __linux__
 #include <sys/trace_txg.h>
+#endif
 
 /*
  * ZFS Transaction Groups

diff --git a/module/zfs/vdev_removal.c b/module/zfs/vdev_removal.c
@@ -46,7 +46,9 @@
 #include <sys/abd.h>
 #include <sys/vdev_initialize.h>
 #include <sys/vdev_trim.h>
+#ifdef __linux__
 #include <sys/trace_vdev.h>
+#endif
 
 /*
  * This file contains the necessary logic to remove vdevs from a

diff --git a/module/zfs/zil.c b/module/zfs/zil.c
@@ -41,9 +41,12 @@
 #include <sys/dmu_tx.h>
 #include <sys/dsl_pool.h>
 #include <sys/metaslab.h>
-#include <sys/trace_zil.h>
 #include <sys/abd.h>
 
+#ifdef __linux__
+#include <sys/trace_zil.h>
+#endif
+
 /*
  * The ZFS Intent Log (ZIL) saves "transaction records" (itxs) of system
  * calls that change the file system. Each itx has enough information to

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -44,11 +44,14 @@
 #include <sys/dsl_scan.h>
 #include <sys/metaslab_impl.h>
 #include <sys/time.h>
-#include <sys/trace_zio.h>
 #include <sys/abd.h>
 #include <sys/dsl_crypt.h>
 #include <sys/cityhash.h>
 
+#ifdef __linux__
+#include <sys/trace_zio.h>
+#endif
+
 /*
  * ==========================================================================
  * I/O type descriptions

diff --git a/module/zfs/zrlock.c b/module/zfs/zrlock.c
@@ -39,7 +39,9 @@
  * function calls.
  */
 #include <sys/zrlock.h>
+#ifdef __linux__
 #include <sys/trace_zrlock.h>
+#endif
 
 /*
  * A ZRL can be locked only while there are zero references, so ZRL_LOCKED is