[XFS] Clean up function name handling in tracing code
Remove the hardcoded "fnames" for tracing, and just embed them in tracing macros via __FUNCTION__. Kills a lot of #ifdefs too. SGI-PV: 967353 SGI-Modid: xfs-linux-melb:xfs-kern:29099a Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Eric Sandeen
committed by
Tim Shimmin
Tim Shimmin
parent
b11f94d537
commit
3a59c94c4b
@@ -76,7 +76,7 @@ static char EXIT[] = "exit";
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_enter(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
char *s,
|
||||
int type,
|
||||
@@ -117,7 +117,7 @@ xfs_bmbt_trace_enter(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argbi(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
xfs_buf_t *b,
|
||||
int i,
|
||||
@@ -134,7 +134,7 @@ xfs_bmbt_trace_argbi(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argbii(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
xfs_buf_t *b,
|
||||
int i0,
|
||||
@@ -153,7 +153,7 @@ xfs_bmbt_trace_argbii(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argfffi(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
xfs_dfiloff_t o,
|
||||
xfs_dfsbno_t b,
|
||||
@@ -172,7 +172,7 @@ xfs_bmbt_trace_argfffi(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argi(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
int i,
|
||||
int line)
|
||||
@@ -188,7 +188,7 @@ xfs_bmbt_trace_argi(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argifk(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
int i,
|
||||
xfs_fsblock_t f,
|
||||
@@ -206,7 +206,7 @@ xfs_bmbt_trace_argifk(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argifr(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
int i,
|
||||
xfs_fsblock_t f,
|
||||
@@ -235,7 +235,7 @@ xfs_bmbt_trace_argifr(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_argik(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
int i,
|
||||
xfs_bmbt_key_t *k,
|
||||
@@ -255,7 +255,7 @@ xfs_bmbt_trace_argik(
|
||||
*/
|
||||
STATIC void
|
||||
xfs_bmbt_trace_cursor(
|
||||
char *func,
|
||||
const char *func,
|
||||
xfs_btree_cur_t *cur,
|
||||
char *s,
|
||||
int line)
|
||||
@@ -274,21 +274,21 @@ xfs_bmbt_trace_cursor(
|
||||
}
|
||||
|
||||
#define XFS_BMBT_TRACE_ARGBI(c,b,i) \
|
||||
xfs_bmbt_trace_argbi(fname, c, b, i, __LINE__)
|
||||
xfs_bmbt_trace_argbi(__FUNCTION__, c, b, i, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGBII(c,b,i,j) \
|
||||
xfs_bmbt_trace_argbii(fname, c, b, i, j, __LINE__)
|
||||
xfs_bmbt_trace_argbii(__FUNCTION__, c, b, i, j, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGFFFI(c,o,b,i,j) \
|
||||
xfs_bmbt_trace_argfffi(fname, c, o, b, i, j, __LINE__)
|
||||
xfs_bmbt_trace_argfffi(__FUNCTION__, c, o, b, i, j, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGI(c,i) \
|
||||
xfs_bmbt_trace_argi(fname, c, i, __LINE__)
|
||||
xfs_bmbt_trace_argi(__FUNCTION__, c, i, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGIFK(c,i,f,s) \
|
||||
xfs_bmbt_trace_argifk(fname, c, i, f, s, __LINE__)
|
||||
xfs_bmbt_trace_argifk(__FUNCTION__, c, i, f, s, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGIFR(c,i,f,r) \
|
||||
xfs_bmbt_trace_argifr(fname, c, i, f, r, __LINE__)
|
||||
xfs_bmbt_trace_argifr(__FUNCTION__, c, i, f, r, __LINE__)
|
||||
#define XFS_BMBT_TRACE_ARGIK(c,i,k) \
|
||||
xfs_bmbt_trace_argik(fname, c, i, k, __LINE__)
|
||||
xfs_bmbt_trace_argik(__FUNCTION__, c, i, k, __LINE__)
|
||||
#define XFS_BMBT_TRACE_CURSOR(c,s) \
|
||||
xfs_bmbt_trace_cursor(fname, c, s, __LINE__)
|
||||
xfs_bmbt_trace_cursor(__FUNCTION__, c, s, __LINE__)
|
||||
#else
|
||||
#define XFS_BMBT_TRACE_ARGBI(c,b,i)
|
||||
#define XFS_BMBT_TRACE_ARGBII(c,b,i,j)
|
||||
@@ -318,9 +318,6 @@ xfs_bmbt_delrec(
|
||||
xfs_fsblock_t bno; /* fs-relative block number */
|
||||
xfs_buf_t *bp; /* buffer for block */
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_delrec";
|
||||
#endif
|
||||
int i; /* loop counter */
|
||||
int j; /* temp state */
|
||||
xfs_bmbt_key_t key; /* bmap btree key */
|
||||
@@ -694,9 +691,6 @@ xfs_bmbt_insrec(
|
||||
xfs_bmbt_block_t *block; /* bmap btree block */
|
||||
xfs_buf_t *bp; /* buffer for block */
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_insrec";
|
||||
#endif
|
||||
int i; /* loop index */
|
||||
xfs_bmbt_key_t key; /* bmap btree key */
|
||||
xfs_bmbt_key_t *kp=NULL; /* pointer to bmap btree key */
|
||||
@@ -880,9 +874,6 @@ xfs_bmbt_killroot(
|
||||
xfs_bmbt_ptr_t *cpp;
|
||||
#ifdef DEBUG
|
||||
int error;
|
||||
#endif
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_killroot";
|
||||
#endif
|
||||
int i;
|
||||
xfs_bmbt_key_t *kp;
|
||||
@@ -973,9 +964,6 @@ xfs_bmbt_log_keys(
|
||||
int kfirst,
|
||||
int klast)
|
||||
{
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_log_keys";
|
||||
#endif
|
||||
xfs_trans_t *tp;
|
||||
|
||||
XFS_BMBT_TRACE_CURSOR(cur, ENTRY);
|
||||
@@ -1012,9 +1000,6 @@ xfs_bmbt_log_ptrs(
|
||||
int pfirst,
|
||||
int plast)
|
||||
{
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_log_ptrs";
|
||||
#endif
|
||||
xfs_trans_t *tp;
|
||||
|
||||
XFS_BMBT_TRACE_CURSOR(cur, ENTRY);
|
||||
@@ -1055,9 +1040,6 @@ xfs_bmbt_lookup(
|
||||
xfs_daddr_t d;
|
||||
xfs_sfiloff_t diff;
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_lookup";
|
||||
#endif
|
||||
xfs_fsblock_t fsbno=0;
|
||||
int high;
|
||||
int i;
|
||||
@@ -1195,9 +1177,6 @@ xfs_bmbt_lshift(
|
||||
int *stat) /* success/failure */
|
||||
{
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_lshift";
|
||||
#endif
|
||||
#ifdef DEBUG
|
||||
int i; /* loop counter */
|
||||
#endif
|
||||
@@ -1331,9 +1310,6 @@ xfs_bmbt_rshift(
|
||||
int *stat) /* success/failure */
|
||||
{
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_rshift";
|
||||
#endif
|
||||
int i; /* loop counter */
|
||||
xfs_bmbt_key_t key; /* bmap btree key */
|
||||
xfs_buf_t *lbp; /* left buffer pointer */
|
||||
@@ -1492,9 +1468,6 @@ xfs_bmbt_split(
|
||||
{
|
||||
xfs_alloc_arg_t args; /* block allocation args */
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_split";
|
||||
#endif
|
||||
int i; /* loop counter */
|
||||
xfs_fsblock_t lbno; /* left sibling block number */
|
||||
xfs_buf_t *lbp; /* left buffer pointer */
|
||||
@@ -1640,9 +1613,6 @@ xfs_bmbt_updkey(
|
||||
xfs_buf_t *bp;
|
||||
#ifdef DEBUG
|
||||
int error;
|
||||
#endif
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_updkey";
|
||||
#endif
|
||||
xfs_bmbt_key_t *kp;
|
||||
int ptr;
|
||||
@@ -1712,9 +1682,6 @@ xfs_bmbt_decrement(
|
||||
xfs_bmbt_block_t *block;
|
||||
xfs_buf_t *bp;
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_decrement";
|
||||
#endif
|
||||
xfs_fsblock_t fsbno;
|
||||
int lev;
|
||||
xfs_mount_t *mp;
|
||||
@@ -1785,9 +1752,6 @@ xfs_bmbt_delete(
|
||||
int *stat) /* success/failure */
|
||||
{
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_delete";
|
||||
#endif
|
||||
int i;
|
||||
int level;
|
||||
|
||||
@@ -2000,9 +1964,6 @@ xfs_bmbt_increment(
|
||||
xfs_bmbt_block_t *block;
|
||||
xfs_buf_t *bp;
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_increment";
|
||||
#endif
|
||||
xfs_fsblock_t fsbno;
|
||||
int lev;
|
||||
xfs_mount_t *mp;
|
||||
@@ -2080,9 +2041,6 @@ xfs_bmbt_insert(
|
||||
int *stat) /* success/failure */
|
||||
{
|
||||
int error; /* error return value */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_insert";
|
||||
#endif
|
||||
int i;
|
||||
int level;
|
||||
xfs_fsblock_t nbno;
|
||||
@@ -2142,9 +2100,6 @@ xfs_bmbt_log_block(
|
||||
int fields)
|
||||
{
|
||||
int first;
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_log_block";
|
||||
#endif
|
||||
int last;
|
||||
xfs_trans_t *tp;
|
||||
static const short offsets[] = {
|
||||
@@ -2181,9 +2136,6 @@ xfs_bmbt_log_recs(
|
||||
{
|
||||
xfs_bmbt_block_t *block;
|
||||
int first;
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_log_recs";
|
||||
#endif
|
||||
int last;
|
||||
xfs_bmbt_rec_t *rp;
|
||||
xfs_trans_t *tp;
|
||||
@@ -2245,9 +2197,6 @@ xfs_bmbt_newroot(
|
||||
xfs_bmbt_key_t *ckp; /* child key pointer */
|
||||
xfs_bmbt_ptr_t *cpp; /* child ptr pointer */
|
||||
int error; /* error return code */
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_newroot";
|
||||
#endif
|
||||
#ifdef DEBUG
|
||||
int i; /* loop counter */
|
||||
#endif
|
||||
@@ -2630,9 +2579,6 @@ xfs_bmbt_update(
|
||||
xfs_bmbt_block_t *block;
|
||||
xfs_buf_t *bp;
|
||||
int error;
|
||||
#ifdef XFS_BMBT_TRACE
|
||||
static char fname[] = "xfs_bmbt_update";
|
||||
#endif
|
||||
xfs_bmbt_key_t key;
|
||||
int ptr;
|
||||
xfs_bmbt_rec_t *rp;
|
||||
|
||||
Reference in New Issue
Block a user