0b1b213fcf
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>
100 lines
3.3 KiB
C
100 lines
3.3 KiB
C
/*
|
|
* Copyright (c) 2008 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#ifndef __XFS_BTREE_TRACE_H__
|
|
#define __XFS_BTREE_TRACE_H__
|
|
|
|
struct xfs_btree_cur;
|
|
struct xfs_buf;
|
|
|
|
|
|
/*
|
|
* Trace hooks.
|
|
* i,j = integer (32 bit)
|
|
* b = btree block buffer (xfs_buf_t)
|
|
* p = btree ptr
|
|
* r = btree record
|
|
* k = btree key
|
|
*/
|
|
|
|
#ifdef XFS_BTREE_TRACE
|
|
|
|
/*
|
|
* Trace buffer entry types.
|
|
*/
|
|
#define XFS_BTREE_KTRACE_ARGBI 1
|
|
#define XFS_BTREE_KTRACE_ARGBII 2
|
|
#define XFS_BTREE_KTRACE_ARGFFFI 3
|
|
#define XFS_BTREE_KTRACE_ARGI 4
|
|
#define XFS_BTREE_KTRACE_ARGIPK 5
|
|
#define XFS_BTREE_KTRACE_ARGIPR 6
|
|
#define XFS_BTREE_KTRACE_ARGIK 7
|
|
#define XFS_BTREE_KTRACE_ARGR 8
|
|
#define XFS_BTREE_KTRACE_CUR 9
|
|
|
|
/*
|
|
* Sub-types for cursor traces.
|
|
*/
|
|
#define XBT_ARGS 0
|
|
#define XBT_ENTRY 1
|
|
#define XBT_ERROR 2
|
|
#define XBT_EXIT 3
|
|
|
|
void xfs_btree_trace_argbi(const char *, struct xfs_btree_cur *,
|
|
struct xfs_buf *, int, int);
|
|
void xfs_btree_trace_argbii(const char *, struct xfs_btree_cur *,
|
|
struct xfs_buf *, int, int, int);
|
|
void xfs_btree_trace_argi(const char *, struct xfs_btree_cur *, int, int);
|
|
void xfs_btree_trace_argipk(const char *, struct xfs_btree_cur *, int,
|
|
union xfs_btree_ptr, union xfs_btree_key *, int);
|
|
void xfs_btree_trace_argipr(const char *, struct xfs_btree_cur *, int,
|
|
union xfs_btree_ptr, union xfs_btree_rec *, int);
|
|
void xfs_btree_trace_argik(const char *, struct xfs_btree_cur *, int,
|
|
union xfs_btree_key *, int);
|
|
void xfs_btree_trace_argr(const char *, struct xfs_btree_cur *,
|
|
union xfs_btree_rec *, int);
|
|
void xfs_btree_trace_cursor(const char *, struct xfs_btree_cur *, int, int);
|
|
|
|
#define XFS_BTREE_TRACE_ARGBI(c, b, i) \
|
|
xfs_btree_trace_argbi(__func__, c, b, i, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGBII(c, b, i, j) \
|
|
xfs_btree_trace_argbii(__func__, c, b, i, j, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGI(c, i) \
|
|
xfs_btree_trace_argi(__func__, c, i, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGIPK(c, i, p, k) \
|
|
xfs_btree_trace_argipk(__func__, c, i, p, k, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGIPR(c, i, p, r) \
|
|
xfs_btree_trace_argipr(__func__, c, i, p, r, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGIK(c, i, k) \
|
|
xfs_btree_trace_argik(__func__, c, i, k, __LINE__)
|
|
#define XFS_BTREE_TRACE_ARGR(c, r) \
|
|
xfs_btree_trace_argr(__func__, c, r, __LINE__)
|
|
#define XFS_BTREE_TRACE_CURSOR(c, t) \
|
|
xfs_btree_trace_cursor(__func__, c, t, __LINE__)
|
|
#else
|
|
#define XFS_BTREE_TRACE_ARGBI(c, b, i)
|
|
#define XFS_BTREE_TRACE_ARGBII(c, b, i, j)
|
|
#define XFS_BTREE_TRACE_ARGI(c, i)
|
|
#define XFS_BTREE_TRACE_ARGIPK(c, i, p, s)
|
|
#define XFS_BTREE_TRACE_ARGIPR(c, i, p, r)
|
|
#define XFS_BTREE_TRACE_ARGIK(c, i, k)
|
|
#define XFS_BTREE_TRACE_ARGR(c, r)
|
|
#define XFS_BTREE_TRACE_CURSOR(c, t)
|
|
#endif /* XFS_BTREE_TRACE */
|
|
|
|
#endif /* __XFS_BTREE_TRACE_H__ */
|