]> Pileus Git - ~andy/linux/commitdiff
[XFS] make btree tracing generic
authorChristoph Hellwig <hch@infradead.org>
Thu, 30 Oct 2008 05:58:50 +0000 (16:58 +1100)
committerLachlan McIlroy <lachlan@sgi.com>
Thu, 30 Oct 2008 05:58:50 +0000 (16:58 +1100)
Make the existing bmap btree tracing generic so that it applies to all
btree types.

Some fragments lifted from a patch by Dave Chinner.

This adds two files that were missed from the previous btree tracing
checkin.

SGI-PV: 985583

SGI-Modid: xfs-linux-melb:xfs-kern:32210a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Bill O'Donnell <billodo@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>
fs/xfs/xfs_btree_trace.c [new file with mode: 0644]
fs/xfs/xfs_btree_trace.h [new file with mode: 0644]

diff --git a/fs/xfs/xfs_btree_trace.c b/fs/xfs/xfs_btree_trace.c
new file mode 100644 (file)
index 0000000..44ff942
--- /dev/null
@@ -0,0 +1,249 @@
+/*
+ * 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
+ */
+#include "xfs.h"
+#include "xfs_types.h"
+#include "xfs_inum.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_alloc_btree.h"
+#include "xfs_ialloc_btree.h"
+#include "xfs_inode.h"
+#include "xfs_btree.h"
+#include "xfs_btree_trace.h"
+
+STATIC void
+xfs_btree_trace_ptr(
+       struct xfs_btree_cur    *cur,
+       union xfs_btree_ptr     ptr,
+       __psunsigned_t          *high,
+       __psunsigned_t          *low)
+{
+       if (cur->bc_flags & XFS_BTREE_LONG_PTRS) {
+               __u64 val = be64_to_cpu(ptr.l);
+               *high = val >> 32;
+               *low = (int)val;
+       } else {
+               *high = 0;
+               *low = be32_to_cpu(ptr.s);
+       }
+}
+
+/*
+ * Add a trace buffer entry for arguments, for a buffer & 1 integer arg.
+ */
+void
+xfs_btree_trace_argbi(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       struct xfs_buf          *b,
+       int                     i,
+       int                     line)
+{
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGBI,
+                                line, (__psunsigned_t)b, i, 0, 0, 0, 0, 0,
+                                0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for a buffer & 2 integer args.
+ */
+void
+xfs_btree_trace_argbii(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       struct xfs_buf          *b,
+       int                     i0,
+       int                     i1,
+       int                     line)
+{
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGBII,
+                                line, (__psunsigned_t)b, i0, i1, 0, 0, 0, 0,
+                                0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for 3 block-length args
+ * and an integer arg.
+ */
+void
+xfs_btree_trace_argfffi(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       xfs_dfiloff_t           o,
+       xfs_dfsbno_t            b,
+       xfs_dfilblks_t          i,
+       int                     j,
+       int                     line)
+{
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGFFFI,
+                                line,
+                                o >> 32, (int)o,
+                                b >> 32, (int)b,
+                                i >> 32, (int)i,
+                                (int)j, 0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for one integer arg.
+ */
+void
+xfs_btree_trace_argi(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       int                     i,
+       int                     line)
+{
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGI,
+                                line, i, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for int, fsblock, key.
+ */
+void
+xfs_btree_trace_argipk(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       int                     i,
+       union xfs_btree_ptr     ptr,
+       union xfs_btree_key     *key,
+       int                     line)
+{
+       __psunsigned_t          high, low;
+       __uint64_t              l0, l1;
+
+       xfs_btree_trace_ptr(cur, ptr, &high, &low);
+       cur->bc_ops->trace_key(cur, key, &l0, &l1);
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGIPK,
+                                line, i, high, low,
+                                l0 >> 32, (int)l0,
+                                l1 >> 32, (int)l1,
+                                0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for int, fsblock, rec.
+ */
+void
+xfs_btree_trace_argipr(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       int                     i,
+       union xfs_btree_ptr     ptr,
+       union xfs_btree_rec     *rec,
+       int                     line)
+{
+       __psunsigned_t          high, low;
+       __uint64_t              l0, l1, l2;
+
+       xfs_btree_trace_ptr(cur, ptr, &high, &low);
+       cur->bc_ops->trace_record(cur, rec, &l0, &l1, &l2);
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGIPR,
+                             line, i,
+                             high, low,
+                             l0 >> 32, (int)l0,
+                             l1 >> 32, (int)l1,
+                             l2 >> 32, (int)l2,
+                             0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for int, key.
+ */
+void
+xfs_btree_trace_argik(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       int                     i,
+       union xfs_btree_key     *key,
+       int                     line)
+{
+       __uint64_t              l0, l1;
+
+       cur->bc_ops->trace_key(cur, key, &l0, &l1);
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGIK,
+                                line, i,
+                                l0 >> 32, (int)l0,
+                                l1 >> 32, (int)l1,
+                                0, 0, 0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for arguments, for record.
+ */
+void
+xfs_btree_trace_argr(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       union xfs_btree_rec     *rec,
+       int                     line)
+{
+       __uint64_t              l0, l1, l2;
+
+       cur->bc_ops->trace_record(cur, rec, &l0, &l1, &l2);
+       cur->bc_ops->trace_enter(cur, func, XBT_ARGS, XFS_BTREE_KTRACE_ARGR,
+                             line,
+                             l0 >> 32, (int)l0,
+                             l1 >> 32, (int)l1,
+                             l2 >> 32, (int)l2,
+                             0, 0, 0, 0, 0);
+}
+
+/*
+ * Add a trace buffer entry for the cursor/operation.
+ */
+void
+xfs_btree_trace_cursor(
+       const char              *func,
+       struct xfs_btree_cur    *cur,
+       int                     type,
+       int                     line)
+{
+       __uint32_t              s0;
+       __uint64_t              l0, l1;
+       char                    *s;
+
+       switch (type) {
+       case XBT_ARGS:
+               s = "args";
+               break;
+       case XBT_ENTRY:
+               s = "entry";
+               break;
+       case XBT_ERROR:
+               s = "error";
+               break;
+       case XBT_EXIT:
+               s = "exit";
+               break;
+       default:
+               s = "unknown";
+               break;
+       }
+
+       cur->bc_ops->trace_cursor(cur, &s0, &l0, &l1);
+       cur->bc_ops->trace_enter(cur, func, s, XFS_BTREE_KTRACE_CUR, line,
+                                s0,
+                                l0 >> 32, (int)l0,
+                                l1 >> 32, (int)l1,
+                                (__psunsigned_t)cur->bc_bufs[0],
+                                (__psunsigned_t)cur->bc_bufs[1],
+                                (__psunsigned_t)cur->bc_bufs[2],
+                                (__psunsigned_t)cur->bc_bufs[3],
+                                (cur->bc_ptrs[0] << 16) | cur->bc_ptrs[1],
+                                (cur->bc_ptrs[2] << 16) | cur->bc_ptrs[3]);
+}
diff --git a/fs/xfs/xfs_btree_trace.h b/fs/xfs/xfs_btree_trace.h
new file mode 100644 (file)
index 0000000..b3f5eb3
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * 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_argfffi(const char *, struct xfs_btree_cur *,
+               xfs_dfiloff_t, xfs_dfsbno_t, xfs_dfilblks_t, 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_ALLOCBT_TRACE_SIZE 4096    /* size of global trace buffer */
+extern ktrace_t        *xfs_allocbt_trace_buf;
+
+#define XFS_INOBT_TRACE_SIZE   4096    /* size of global trace buffer */
+extern ktrace_t        *xfs_inobt_trace_buf;
+
+#define XFS_BMBT_TRACE_SIZE    4096    /* size of global trace buffer */
+#define XFS_BMBT_KTRACE_SIZE   32      /* size of per-inode trace buffer */
+extern ktrace_t        *xfs_bmbt_trace_buf;
+
+
+#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_ARGFFFI(c, o, b, i, j)  \
+       xfs_btree_trace_argfffi(__func__, c, o, 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_ARGFFFI(c, o, 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__ */