Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=dfbfbf58c81852... Commit: dfbfbf58c8185246746a78e04ddbe8446ca6f1cf Parent: 8559cf71e32d103051c8262eb0bd24481382e8b3 Author: Bob Peterson rpeterso@redhat.com AuthorDate: Mon Aug 8 16:11:48 2011 -0500 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Fri Apr 5 06:24:59 2013 -0700
libgfs2: libgfs2: Use __FUNCTION__ rather than __FILE__
This patch changes the debug output of gfs2-utils to use __FUNCTION__ rather than __FILE__. The output file is much smaller. Digging through a 6.5GB output is better and faster than a 9GB output file.
rhbz#877150 --- gfs2/fsck/metawalk.c | 13 +++---------- gfs2/fsck/metawalk.h | 2 +- gfs2/libgfs2/libgfs2.h | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 6b3c7f0..729a559 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -112,17 +112,10 @@ int _fsck_blockmap_set(struct gfs2_inode *ip, uint64_t bblock, int error;
if (print_level >= MSG_DEBUG) { - const char *p; - - p = strrchr(caller, '/'); - if (p) - p++; - else - p = caller; /* I'm circumventing the log levels here on purpose to make the output easier to debug. */ if (ip->i_di.di_num.no_addr == bblock) { - print_fsck_log(MSG_DEBUG, p, fline, + print_fsck_log(MSG_DEBUG, caller, fline, _("%s inode found at block %lld " "(0x%llx): marking as '%s'\n"), btype, (unsigned long long) @@ -131,7 +124,7 @@ int _fsck_blockmap_set(struct gfs2_inode *ip, uint64_t bblock, ip->i_di.di_num.no_addr, block_type_string(mark)); } else if (mark == gfs2_bad_block || mark == gfs2_meta_inval) { - print_fsck_log(MSG_DEBUG, p, fline, + print_fsck_log(MSG_DEBUG, caller, fline, _("inode %lld (0x%llx) references " "%s block %lld (0x%llx): " "marking as '%s'\n"), @@ -143,7 +136,7 @@ int _fsck_blockmap_set(struct gfs2_inode *ip, uint64_t bblock, (unsigned long long)bblock, block_type_string(mark)); } else { - print_fsck_log(MSG_DEBUG, p, fline, + print_fsck_log(MSG_DEBUG, caller, fline, _("inode %lld (0x%llx) references " "%s block %lld (0x%llx): " "marking as '%s'\n"), diff --git a/gfs2/fsck/metawalk.h b/gfs2/fsck/metawalk.h index b13dcb4..2fbc636 100644 --- a/gfs2/fsck/metawalk.h +++ b/gfs2/fsck/metawalk.h @@ -51,7 +51,7 @@ extern struct gfs2_inode *fsck_system_inode(struct gfs2_sbd *sdp, #define is_duplicate(dblock) ((dupfind(dblock)) ? 1 : 0)
#define fsck_blockmap_set(ip, b, bt, m) _fsck_blockmap_set(ip, b, bt, m, \ - __FILE__, __LINE__) + __FUNCTION__, __LINE__)
/* metawalk_fxns: function pointers to check various parts of the fs * diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 2869268..2acffcf 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -583,7 +583,7 @@ extern int print_level; #define MSG_NULL 1
#define print_log(priority, format...) \ - do { print_fsck_log(priority, __FILE__, __LINE__, ## format); } while(0) + do { print_fsck_log(priority, __FUNCTION__, __LINE__, ## format); } while(0)
#define log_debug(format...) \ do { if(print_level >= MSG_DEBUG) print_log(MSG_DEBUG, format); } while(0)