* [Cluster-devel] [Patch 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for debug messages
@ 2011-08-11 21:05 Bob Peterson
2011-08-12 9:33 ` Steven Whitehouse
0 siblings, 1 reply; 2+ messages in thread
From: Bob Peterson @ 2011-08-11 21:05 UTC (permalink / raw)
To: cluster-devel.redhat.com
From 97b0253e2347b87f29ecf5d5fefbb08655358bb2 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Mon, 8 Aug 2011 16:11:48 -0500
Subject: [PATCH 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for
debug messages
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#675723
---
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 6bdea5a..9abec79 100644
--- a/gfs2/fsck/metawalk.c
+++ b/gfs2/fsck/metawalk.c
@@ -100,17 +100,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)
@@ -119,7 +112,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"),
@@ -131,7 +124,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 c15d7b7..d705726 100644
--- a/gfs2/fsck/metawalk.h
+++ b/gfs2/fsck/metawalk.h
@@ -39,7 +39,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 8f2ac89..d418d2f 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -697,7 +697,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)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] [Patch 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for debug messages
2011-08-11 21:05 [Cluster-devel] [Patch 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for debug messages Bob Peterson
@ 2011-08-12 9:33 ` Steven Whitehouse
0 siblings, 0 replies; 2+ messages in thread
From: Steven Whitehouse @ 2011-08-12 9:33 UTC (permalink / raw)
To: cluster-devel.redhat.com
ACK. Looks good,
Steve.
On Thu, 2011-08-11 at 17:05 -0400, Bob Peterson wrote:
> >From 97b0253e2347b87f29ecf5d5fefbb08655358bb2 Mon Sep 17 00:00:00 2001
> From: Bob Peterson <rpeterso@redhat.com>
> Date: Mon, 8 Aug 2011 16:11:48 -0500
> Subject: [PATCH 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for
> debug messages
>
> 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#675723
> ---
> 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 6bdea5a..9abec79 100644
> --- a/gfs2/fsck/metawalk.c
> +++ b/gfs2/fsck/metawalk.c
> @@ -100,17 +100,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)
> @@ -119,7 +112,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"),
> @@ -131,7 +124,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 c15d7b7..d705726 100644
> --- a/gfs2/fsck/metawalk.h
> +++ b/gfs2/fsck/metawalk.h
> @@ -39,7 +39,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 8f2ac89..d418d2f 100644
> --- a/gfs2/libgfs2/libgfs2.h
> +++ b/gfs2/libgfs2/libgfs2.h
> @@ -697,7 +697,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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-12 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-11 21:05 [Cluster-devel] [Patch 16/44] libgfs2: Use __FUNCTION__ rather than __FILE__ for debug messages Bob Peterson
2011-08-12 9:33 ` Steven Whitehouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).