Skip to content

Commit

Permalink
OpenZFS restructuring - move linux tracing code to platform directories
Browse files Browse the repository at this point in the history
Move Linux specific tracing headers and source to platform directories
and update the build system.

Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed by: Brad Lewis <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes openzfs#9290
  • Loading branch information
mattmacy authored and behlendorf committed Sep 11, 2019
1 parent 5815f7a commit d666206
Show file tree
Hide file tree
Showing 37 changed files with 89 additions and 34 deletions.
1 change: 1 addition & 0 deletions include/os/linux/spl/sys/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ KERNEL_H = \
$(top_srcdir)/include/os/linux/spl/sys/thread.h \
$(top_srcdir)/include/os/linux/spl/sys/time.h \
$(top_srcdir)/include/os/linux/spl/sys/timer.h \
$(top_srcdir)/include/os/linux/spl/sys/trace.h \
$(top_srcdir)/include/os/linux/spl/sys/tsd.h \
$(top_srcdir)/include/os/linux/spl/sys/types32.h \
$(top_srcdir)/include/os/linux/spl/sys/types.h \
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions include/os/linux/zfs/sys/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
KERNEL_H = \
$(top_srcdir)/include/os/linux/zfs/sys/policy.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_acl.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_arc.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_common.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_defs.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_dbgmsg.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_dbuf.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_dmu.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_dnode.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_multilist.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_rrwlock.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_txg.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_vdev.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_zil.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_zio.h \
$(top_srcdir)/include/os/linux/zfs/sys/trace_zrlock.h \
$(top_srcdir)/include/os/linux/zfs/sys/zfs_ctldir.h \
$(top_srcdir)/include/os/linux/zfs/sys/zfs_dir.h \
$(top_srcdir)/include/os/linux/zfs/sys/zfs_vfsops.h \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
52 changes: 52 additions & 0 deletions include/os/linux/zfs/sys/trace_defs.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License (the "License").
* You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
* If applicable, add the following below this CDDL HEADER, with the
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/

#ifndef _OS_LINUX_ZFS_TRACE_H
#define _OS_LINUX_ZFS_TRACE_H

#include <sys/multilist.h>
#include <sys/arc_impl.h>
#include <sys/vdev_impl.h>
#include <sys/zio.h>
#include <sys/dbuf.h>
#include <sys/dmu_objset.h>
#include <sys/dsl_dataset.h>
#include <sys/dmu_tx.h>
#include <sys/dnode.h>
#include <sys/zfs_znode.h>
#include <sys/zil_impl.h>
#include <sys/zrlock.h>

#include <sys/trace.h>
#include <sys/trace_acl.h>
#include <sys/trace_arc.h>
#include <sys/trace_dbuf.h>
#include <sys/trace_dmu.h>
#include <sys/trace_dnode.h>
#include <sys/trace_multilist.h>
#include <sys/trace_rrwlock.h>
#include <sys/trace_txg.h>
#include <sys/trace_vdev.h>
#include <sys/trace_zil.h>
#include <sys/trace_zio.h>
#include <sys/trace_zrlock.h>

#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

/*
* If tracepoints are available define dtrace_probe events for vdev
* related probes. Definitions in usr/include/trace.h will map
* DTRACE_PROBE* calls to tracepoints.
* related probes. Definitions in include/os/linux/spl/sys/trace.h
* will map DTRACE_PROBE* calls to tracepoints.
*/

#undef TRACE_SYSTEM
Expand Down Expand Up @@ -129,7 +129,7 @@ DEFINE_REMOVE_FREE_EVENT_TXG(zfs_remove__free__inflight);
* When tracepoints are not available, a DEFINE_DTRACE_PROBE* macro is
* needed for each DTRACE_PROBE. These will be used to generate stub
* tracing functions and prototypes for those functions. See
* include/sys/trace.h.
* include/os/linux/spl/sys/trace.h.
*/

DEFINE_DTRACE_PROBE3(remove__free__synced);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions include/sys/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,6 @@ COMMON_H = \
$(top_srcdir)/include/sys/spa_impl.h \
$(top_srcdir)/include/sys/spa_checksum.h \
$(top_srcdir)/include/sys/sysevent.h \
$(top_srcdir)/include/sys/trace.h \
$(top_srcdir)/include/sys/trace_acl.h \
$(top_srcdir)/include/sys/trace_arc.h \
$(top_srcdir)/include/sys/trace_common.h \
$(top_srcdir)/include/sys/trace_dbgmsg.h \
$(top_srcdir)/include/sys/trace_dbuf.h \
$(top_srcdir)/include/sys/trace_dmu.h \
$(top_srcdir)/include/sys/trace_dnode.h \
$(top_srcdir)/include/sys/trace_multilist.h \
$(top_srcdir)/include/sys/trace_rrwlock.h \
$(top_srcdir)/include/sys/trace_txg.h \
$(top_srcdir)/include/sys/trace_vdev.h \
$(top_srcdir)/include/sys/trace_zil.h \
$(top_srcdir)/include/sys/trace_zio.h \
$(top_srcdir)/include/sys/trace_zrlock.h \
$(top_srcdir)/include/sys/txg.h \
$(top_srcdir)/include/sys/txg_impl.h \
$(top_srcdir)/include/sys/u8_textprep_data.h \
Expand Down
1 change: 1 addition & 0 deletions lib/libspl/include/sys/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ libspl_HEADERS = \
$(top_srcdir)/lib/libspl/include/sys/sysmacros.h \
$(top_srcdir)/lib/libspl/include/sys/systeminfo.h \
$(top_srcdir)/lib/libspl/include/sys/time.h \
$(top_srcdir)/lib/libspl/include/sys/trace_defs.h \
$(top_srcdir)/lib/libspl/include/sys/types32.h \
$(top_srcdir)/lib/libspl/include/sys/types.h \
$(top_srcdir)/lib/libspl/include/sys/tzfile.h \
Expand Down
1 change: 1 addition & 0 deletions lib/libspl/include/sys/trace_defs.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* Here to keep the libspl build happy */
1 change: 1 addition & 0 deletions module/os/linux/zfs/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ccflags-y += -I@abs_top_srcdir@/module/os/linux/zfs

$(MODULE)-objs += ../os/linux/zfs/abd.o
$(MODULE)-objs += ../os/linux/zfs/policy.o
$(MODULE)-objs += ../os/linux/zfs/trace.o
$(MODULE)-objs += ../os/linux/zfs/qat.o
$(MODULE)-objs += ../os/linux/zfs/qat_compress.o
$(MODULE)-objs += ../os/linux/zfs/qat_crypt.o
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/trace.c → module/os/linux/zfs/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@
#include <sys/dsl_dataset.h>
#include <sys/dmu_tx.h>
#include <sys/dnode.h>
#include <sys/multilist.h>
#include <sys/zfs_znode.h>
#include <sys/zil_impl.h>
#include <sys/zrlock.h>

#ifdef _KERNEL
#define CREATE_TRACE_POINTS
#include <sys/trace.h>
#include <sys/trace_acl.h>
Expand All @@ -52,3 +51,4 @@
#include <sys/trace_zil.h>
#include <sys/trace_zio.h>
#include <sys/trace_zrlock.h>
#endif
1 change: 0 additions & 1 deletion module/zfs/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ $(MODULE)-objs += spa_log_spacemap.o
$(MODULE)-objs += spa_misc.o
$(MODULE)-objs += space_map.o
$(MODULE)-objs += space_reftree.o
$(MODULE)-objs += trace.o
$(MODULE)-objs += txg.o
$(MODULE)-objs += uberblock.o
$(MODULE)-objs += unique.o
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/arc.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
#include <sys/zthr.h>
#include <zfs_fletcher.h>
#include <sys/arc_impl.h>
#include <sys/trace_arc.h>
#include <sys/trace_defs.h>
#include <sys/aggsum.h>
#include <sys/cityhash.h>

Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <sys/zfeature.h>
#include <sys/blkptr.h>
#include <sys/range_tree.h>
#include <sys/trace_dbuf.h>
#include <sys/trace_defs.h>
#include <sys/callb.h>
#include <sys/abd.h>
#include <sys/vdev.h>
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include <sys/sa.h>
#include <sys/zfeature.h>
#include <sys/abd.h>
#include <sys/trace_dmu.h>
#include <sys/trace_defs.h>
#include <sys/zfs_rlock.h>
#ifdef _KERNEL
#include <sys/vmsystm.h>
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dmu_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <sys/sa.h>
#include <sys/sa_impl.h>
#include <sys/zfs_context.h>
#include <sys/trace_dmu.h>
#include <sys/trace_defs.h>

typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
uint64_t arg1, uint64_t arg2);
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <sys/zio.h>
#include <sys/dmu_zfetch.h>
#include <sys/range_tree.h>
#include <sys/trace_dnode.h>
#include <sys/trace_defs.h>
#include <sys/zfs_project.h>

dnode_stats_t dnode_stats = {
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dsl_pool.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <sys/zfeature.h>
#include <sys/zil_impl.h>
#include <sys/dsl_userhold.h>
#include <sys/trace_txg.h>
#include <sys/trace_defs.h>
#include <sys/mmp.h>

/*
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/multilist.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <sys/zfs_context.h>
#include <sys/multilist.h>
#include <sys/trace_multilist.h>
#include <sys/trace_defs.h>

/* needed for spa_get_random() */
#include <sys/spa.h>
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/rrwlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <sys/refcount.h>
#include <sys/rrwlock.h>
#include <sys/trace_rrwlock.h>
#include <sys/trace_defs.h>

/*
* This file contains the implementation of a re-entrant read
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/txg.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <sys/dsl_scan.h>
#include <sys/zil.h>
#include <sys/callb.h>
#include <sys/trace_txg.h>
#include <sys/trace_defs.h>

/*
* ZFS Transaction Groups
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/vdev_removal.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include <sys/abd.h>
#include <sys/vdev_initialize.h>
#include <sys/vdev_trim.h>
#include <sys/trace_vdev.h>
#include <sys/trace_defs.h>

/*
* This file contains the necessary logic to remove vdevs from a
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/zil.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <sys/dmu_tx.h>
#include <sys/dsl_pool.h>
#include <sys/metaslab.h>
#include <sys/trace_zil.h>
#include <sys/trace_defs.h>
#include <sys/abd.h>

/*
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/zio.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <sys/dsl_scan.h>
#include <sys/metaslab_impl.h>
#include <sys/time.h>
#include <sys/trace_zio.h>
#include <sys/trace_defs.h>
#include <sys/abd.h>
#include <sys/dsl_crypt.h>
#include <sys/cityhash.h>
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/zrlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* function calls.
*/
#include <sys/zrlock.h>
#include <sys/trace_zrlock.h>
#include <sys/trace_defs.h>

/*
* A ZRL can be locked only while there are zero references, so ZRL_LOCKED is
Expand Down

0 comments on commit d666206

Please sign in to comment.