diff options
author | Christoph Hellwig <hch@infradead.org> | 2009-12-14 18:14:59 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2009-12-15 00:08:16 -0500 |
commit | 0b1b213fcf3a8486ada99a2bab84ab8c6f51b264 (patch) | |
tree | 661fd8da7487231224c77b95c33986cb7d7b41ef /fs/xfs/xfs_trans.h | |
parent | 6ef3554422e2c7e7aa424ba63737da498881dff4 (diff) |
xfs: event tracing support
Convert the old xfs tracing support that could only be used with the
out of tree kdb and xfsidbg patches to use the generic event tracer.
To use it make sure CONFIG_EVENT_TRACING is enabled and then enable
all xfs trace channels by:
echo 1 > /sys/kernel/debug/tracing/events/xfs/enable
or alternatively enable single events by just doing the same in one
event subdirectory, e.g.
echo 1 > /sys/kernel/debug/tracing/events/xfs/xfs_ihold/enable
or set more complex filters, etc. In Documentation/trace/events.txt
all this is desctribed in more detail. To reads the events do a
cat /sys/kernel/debug/tracing/trace
Compared to the last posting this patch converts the tracing mostly to
the one tracepoint per callsite model that other users of the new
tracing facility also employ. This allows a very fine-grained control
of the tracing, a cleaner output of the traces and also enables the
perf tool to use each tracepoint as a virtual performance counter,
allowing us to e.g. count how often certain workloads git various
spots in XFS. Take a look at
http://lwn.net/Articles/346470/
for some examples.
Also the btree tracing isn't included at all yet, as it will require
additional core tracing features not in mainline yet, I plan to
deliver it later.
And the really nice thing about this patch is that it actually removes
many lines of code while adding this nice functionality:
fs/xfs/Makefile | 8
fs/xfs/linux-2.6/xfs_acl.c | 1
fs/xfs/linux-2.6/xfs_aops.c | 52 -
fs/xfs/linux-2.6/xfs_aops.h | 2
fs/xfs/linux-2.6/xfs_buf.c | 117 +--
fs/xfs/linux-2.6/xfs_buf.h | 33
fs/xfs/linux-2.6/xfs_fs_subr.c | 3
fs/xfs/linux-2.6/xfs_ioctl.c | 1
fs/xfs/linux-2.6/xfs_ioctl32.c | 1
fs/xfs/linux-2.6/xfs_iops.c | 1
fs/xfs/linux-2.6/xfs_linux.h | 1
fs/xfs/linux-2.6/xfs_lrw.c | 87 --
fs/xfs/linux-2.6/xfs_lrw.h | 45 -
fs/xfs/linux-2.6/xfs_super.c | 104 ---
fs/xfs/linux-2.6/xfs_super.h | 7
fs/xfs/linux-2.6/xfs_sync.c | 1
fs/xfs/linux-2.6/xfs_trace.c | 75 ++
fs/xfs/linux-2.6/xfs_trace.h | 1369 +++++++++++++++++++++++++++++++++++++++++
fs/xfs/linux-2.6/xfs_vnode.h | 4
fs/xfs/quota/xfs_dquot.c | 110 ---
fs/xfs/quota/xfs_dquot.h | 21
fs/xfs/quota/xfs_qm.c | 40 -
fs/xfs/quota/xfs_qm_syscalls.c | 4
fs/xfs/support/ktrace.c | 323 ---------
fs/xfs/support/ktrace.h | 85 --
fs/xfs/xfs.h | 16
fs/xfs/xfs_ag.h | 14
fs/xfs/xfs_alloc.c | 230 +-----
fs/xfs/xfs_alloc.h | 27
fs/xfs/xfs_alloc_btree.c | 1
fs/xfs/xfs_attr.c | 107 ---
fs/xfs/xfs_attr.h | 10
fs/xfs/xfs_attr_leaf.c | 14
fs/xfs/xfs_attr_sf.h | 40 -
fs/xfs/xfs_bmap.c | 507 +++------------
fs/xfs/xfs_bmap.h | 49 -
fs/xfs/xfs_bmap_btree.c | 6
fs/xfs/xfs_btree.c | 5
fs/xfs/xfs_btree_trace.h | 17
fs/xfs/xfs_buf_item.c | 87 --
fs/xfs/xfs_buf_item.h | 20
fs/xfs/xfs_da_btree.c | 3
fs/xfs/xfs_da_btree.h | 7
fs/xfs/xfs_dfrag.c | 2
fs/xfs/xfs_dir2.c | 8
fs/xfs/xfs_dir2_block.c | 20
fs/xfs/xfs_dir2_leaf.c | 21
fs/xfs/xfs_dir2_node.c | 27
fs/xfs/xfs_dir2_sf.c | 26
fs/xfs/xfs_dir2_trace.c | 216 ------
fs/xfs/xfs_dir2_trace.h | 72 --
fs/xfs/xfs_filestream.c | 8
fs/xfs/xfs_fsops.c | 2
fs/xfs/xfs_iget.c | 111 ---
fs/xfs/xfs_inode.c | 67 --
fs/xfs/xfs_inode.h | 76 --
fs/xfs/xfs_inode_item.c | 5
fs/xfs/xfs_iomap.c | 85 --
fs/xfs/xfs_iomap.h | 8
fs/xfs/xfs_log.c | 181 +----
fs/xfs/xfs_log_priv.h | 20
fs/xfs/xfs_log_recover.c | 1
fs/xfs/xfs_mount.c | 2
fs/xfs/xfs_quota.h | 8
fs/xfs/xfs_rename.c | 1
fs/xfs/xfs_rtalloc.c | 1
fs/xfs/xfs_rw.c | 3
fs/xfs/xfs_trans.h | 47 +
fs/xfs/xfs_trans_buf.c | 62 -
fs/xfs/xfs_vnodeops.c | 8
70 files changed, 2151 insertions(+), 2592 deletions(-)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_trans.h')
-rw-r--r-- | fs/xfs/xfs_trans.h | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index a0574f593f52..ca64f33c63a3 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h | |||
@@ -100,6 +100,49 @@ typedef struct xfs_trans_header { | |||
100 | #define XFS_TRANS_TYPE_MAX 41 | 100 | #define XFS_TRANS_TYPE_MAX 41 |
101 | /* new transaction types need to be reflected in xfs_logprint(8) */ | 101 | /* new transaction types need to be reflected in xfs_logprint(8) */ |
102 | 102 | ||
103 | #define XFS_TRANS_TYPES \ | ||
104 | { XFS_TRANS_SETATTR_NOT_SIZE, "SETATTR_NOT_SIZE" }, \ | ||
105 | { XFS_TRANS_SETATTR_SIZE, "SETATTR_SIZE" }, \ | ||
106 | { XFS_TRANS_INACTIVE, "INACTIVE" }, \ | ||
107 | { XFS_TRANS_CREATE, "CREATE" }, \ | ||
108 | { XFS_TRANS_CREATE_TRUNC, "CREATE_TRUNC" }, \ | ||
109 | { XFS_TRANS_TRUNCATE_FILE, "TRUNCATE_FILE" }, \ | ||
110 | { XFS_TRANS_REMOVE, "REMOVE" }, \ | ||
111 | { XFS_TRANS_LINK, "LINK" }, \ | ||
112 | { XFS_TRANS_RENAME, "RENAME" }, \ | ||
113 | { XFS_TRANS_MKDIR, "MKDIR" }, \ | ||
114 | { XFS_TRANS_RMDIR, "RMDIR" }, \ | ||
115 | { XFS_TRANS_SYMLINK, "SYMLINK" }, \ | ||
116 | { XFS_TRANS_SET_DMATTRS, "SET_DMATTRS" }, \ | ||
117 | { XFS_TRANS_GROWFS, "GROWFS" }, \ | ||
118 | { XFS_TRANS_STRAT_WRITE, "STRAT_WRITE" }, \ | ||
119 | { XFS_TRANS_DIOSTRAT, "DIOSTRAT" }, \ | ||
120 | { XFS_TRANS_WRITEID, "WRITEID" }, \ | ||
121 | { XFS_TRANS_ADDAFORK, "ADDAFORK" }, \ | ||
122 | { XFS_TRANS_ATTRINVAL, "ATTRINVAL" }, \ | ||
123 | { XFS_TRANS_ATRUNCATE, "ATRUNCATE" }, \ | ||
124 | { XFS_TRANS_ATTR_SET, "ATTR_SET" }, \ | ||
125 | { XFS_TRANS_ATTR_RM, "ATTR_RM" }, \ | ||
126 | { XFS_TRANS_ATTR_FLAG, "ATTR_FLAG" }, \ | ||
127 | { XFS_TRANS_CLEAR_AGI_BUCKET, "CLEAR_AGI_BUCKET" }, \ | ||
128 | { XFS_TRANS_QM_SBCHANGE, "QM_SBCHANGE" }, \ | ||
129 | { XFS_TRANS_QM_QUOTAOFF, "QM_QUOTAOFF" }, \ | ||
130 | { XFS_TRANS_QM_DQALLOC, "QM_DQALLOC" }, \ | ||
131 | { XFS_TRANS_QM_SETQLIM, "QM_SETQLIM" }, \ | ||
132 | { XFS_TRANS_QM_DQCLUSTER, "QM_DQCLUSTER" }, \ | ||
133 | { XFS_TRANS_QM_QINOCREATE, "QM_QINOCREATE" }, \ | ||
134 | { XFS_TRANS_QM_QUOTAOFF_END, "QM_QOFF_END" }, \ | ||
135 | { XFS_TRANS_SB_UNIT, "SB_UNIT" }, \ | ||
136 | { XFS_TRANS_FSYNC_TS, "FSYNC_TS" }, \ | ||
137 | { XFS_TRANS_GROWFSRT_ALLOC, "GROWFSRT_ALLOC" }, \ | ||
138 | { XFS_TRANS_GROWFSRT_ZERO, "GROWFSRT_ZERO" }, \ | ||
139 | { XFS_TRANS_GROWFSRT_FREE, "GROWFSRT_FREE" }, \ | ||
140 | { XFS_TRANS_SWAPEXT, "SWAPEXT" }, \ | ||
141 | { XFS_TRANS_SB_COUNT, "SB_COUNT" }, \ | ||
142 | { XFS_TRANS_DUMMY1, "DUMMY1" }, \ | ||
143 | { XFS_TRANS_DUMMY2, "DUMMY2" }, \ | ||
144 | { XLOG_UNMOUNT_REC_TYPE, "UNMOUNT" } | ||
145 | |||
103 | /* | 146 | /* |
104 | * This structure is used to track log items associated with | 147 | * This structure is used to track log items associated with |
105 | * a transaction. It points to the log item and keeps some | 148 | * a transaction. It points to the log item and keeps some |
@@ -782,6 +825,10 @@ typedef struct xfs_log_item { | |||
782 | #define XFS_LI_IN_AIL 0x1 | 825 | #define XFS_LI_IN_AIL 0x1 |
783 | #define XFS_LI_ABORTED 0x2 | 826 | #define XFS_LI_ABORTED 0x2 |
784 | 827 | ||
828 | #define XFS_LI_FLAGS \ | ||
829 | { XFS_LI_IN_AIL, "IN_AIL" }, \ | ||
830 | { XFS_LI_ABORTED, "ABORTED" } | ||
831 | |||
785 | typedef struct xfs_item_ops { | 832 | typedef struct xfs_item_ops { |
786 | uint (*iop_size)(xfs_log_item_t *); | 833 | uint (*iop_size)(xfs_log_item_t *); |
787 | void (*iop_format)(xfs_log_item_t *, struct xfs_log_iovec *); | 834 | void (*iop_format)(xfs_log_item_t *, struct xfs_log_iovec *); |