From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 5/5] libgfs2: Remove logging API
Date: Wed, 07 May 2014 15:48:32 +0100 [thread overview]
Message-ID: <536A47C0.7080806@redhat.com> (raw)
In-Reply-To: <1399473221-28521-5-git-send-email-anprice@redhat.com>
Hi,
Other patches in the series all look good to me,
Steve.
On 07/05/14 15:33, Andrew Price wrote:
> libgfs2 was exposing a logging API (log_info, etc.) but wasn't using it
> itself. Remove the logging bits and move them into
> gfs2/include/logging.h
>
> Signed-off-by: Andrew Price <anprice@redhat.com>
> ---
> gfs2/convert/gfs2_convert.c | 2 ++
> gfs2/edit/savemeta.c | 2 ++
> gfs2/fsck/fs_recovery.c | 1 +
> gfs2/fsck/initialize.c | 1 +
> gfs2/fsck/inode_hash.c | 1 +
> gfs2/fsck/link.c | 1 +
> gfs2/fsck/lost_n_found.c | 1 +
> gfs2/fsck/main.c | 2 ++
> gfs2/fsck/metawalk.c | 1 +
> gfs2/fsck/pass1.c | 1 +
> gfs2/fsck/pass1b.c | 1 +
> gfs2/fsck/pass1c.c | 1 +
> gfs2/fsck/pass2.c | 1 +
> gfs2/fsck/pass3.c | 1 +
> gfs2/fsck/pass4.c | 1 +
> gfs2/fsck/pass5.c | 1 +
> gfs2/fsck/rgrepair.c | 1 +
> gfs2/fsck/util.c | 1 +
> gfs2/include/Makefile.am | 2 +-
> gfs2/include/logging.h | 36 ++++++++++++++++++++++++++++++++++++
> gfs2/libgfs2/Makefile.am | 2 +-
> gfs2/libgfs2/fs_geometry.c | 8 ++++----
> gfs2/libgfs2/gfs2_log.c | 24 ------------------------
> gfs2/libgfs2/libgfs2.h | 34 ----------------------------------
> gfs2/mkfs/main_grow.c | 2 ++
> 25 files changed, 65 insertions(+), 64 deletions(-)
> create mode 100644 gfs2/include/logging.h
> delete mode 100644 gfs2/libgfs2/gfs2_log.c
>
> diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
> index 15a16ef..87bec8c 100644
> --- a/gfs2/convert/gfs2_convert.c
> +++ b/gfs2/convert/gfs2_convert.c
> @@ -30,6 +30,7 @@
>
> #include <linux/types.h>
> #include <linux/gfs2_ondisk.h>
> +#include <logging.h>
> #include "osi_list.h"
> #include "copyright.cf"
> #include "libgfs2.h"
> @@ -112,6 +113,7 @@ uint64_t gfs2_jheightsize[GFS2_MAX_META_HEIGHT];
> uint32_t gfs2_max_height;
> uint32_t gfs2_max_jheight;
> uint64_t jindex_addr = 0, rindex_addr = 0;
> +int print_level = MSG_NOTICE;
>
> /* ------------------------------------------------------------------------- */
> /* This function is for libgfs's sake. */
> diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
> index c9f2d0a..ab7f86f 100644
> --- a/gfs2/edit/savemeta.c
> +++ b/gfs2/edit/savemeta.c
> @@ -20,6 +20,7 @@
> #include <linux/gfs2_ondisk.h>
> #include <zlib.h>
>
> +#include <logging.h>
> #include "osi_list.h"
> #include "gfs2hex.h"
> #include "hexedit.h"
> @@ -47,6 +48,7 @@ uint64_t last_reported_block, blks_saved, total_out, pct;
> uint64_t journal_blocks[MAX_JOURNALS_SAVED];
> uint64_t gfs1_journal_size = 0; /* in blocks */
> int journals_found = 0;
> +int print_level = MSG_NOTICE;
>
> extern void read_superblock(void);
>
> diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
> index 54a8c5f..a052487 100644
> --- a/gfs2/fsck/fs_recovery.c
> +++ b/gfs2/fsck/fs_recovery.c
> @@ -9,6 +9,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "fsck.h"
> #include "fs_recovery.h"
> #include "libgfs2.h"
> diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
> index 9ada7d2..f7ea45f 100644
> --- a/gfs2/fsck/initialize.c
> +++ b/gfs2/fsck/initialize.c
> @@ -15,6 +15,7 @@
>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "util.h"
> diff --git a/gfs2/fsck/inode_hash.c b/gfs2/fsck/inode_hash.c
> index aca5e61..eeb0a84 100644
> --- a/gfs2/fsck/inode_hash.c
> +++ b/gfs2/fsck/inode_hash.c
> @@ -5,6 +5,7 @@
> #include <libintl.h>
> #include <string.h>
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "osi_list.h"
> #include "inode_hash.h"
> diff --git a/gfs2/fsck/link.c b/gfs2/fsck/link.c
> index 72fe7d5..9a958b4 100644
> --- a/gfs2/fsck/link.c
> +++ b/gfs2/fsck/link.c
> @@ -8,6 +8,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "inode_hash.h"
> diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c
> index 919cb2f..9672c7a 100644
> --- a/gfs2/fsck/lost_n_found.c
> +++ b/gfs2/fsck/lost_n_found.c
> @@ -10,6 +10,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "fsck.h"
> #include "libgfs2.h"
> #include "lost_n_found.h"
> diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
> index 0031ec0..05979dc 100644
> --- a/gfs2/fsck/main.c
> +++ b/gfs2/fsck/main.c
> @@ -14,6 +14,7 @@
> #define _(String) gettext(String)
> #include <syslog.h>
>
> +#include <logging.h>
> #include "copyright.cf"
> #include "libgfs2.h"
> #include "fsck.h"
> @@ -39,6 +40,7 @@ struct osi_root inodetree = (struct osi_root) { NULL, };
> int dups_found = 0, dups_found_first = 0;
> struct gfs_sb *sbd1 = NULL;
> int sb_fixed = 0;
> +int print_level = MSG_NOTICE;
>
> /* This function is for libgfs2's sake. */
> void print_it(const char *label, const char *fmt, const char *fmt2, ...)
> diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c
> index 594fbfa..659af4e 100644
> --- a/gfs2/fsck/metawalk.c
> +++ b/gfs2/fsck/metawalk.c
> @@ -12,6 +12,7 @@
> #include <fcntl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "osi_tree.h"
> #include "fsck.h"
> diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
> index df778ef..4f1b77a 100644
> --- a/gfs2/fsck/pass1.c
> +++ b/gfs2/fsck/pass1.c
> @@ -20,6 +20,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "inode_hash.h"
> diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
> index e3da20a..f82f43b 100644
> --- a/gfs2/fsck/pass1b.c
> +++ b/gfs2/fsck/pass1b.c
> @@ -8,6 +8,7 @@
> #include <sys/stat.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "osi_list.h"
> diff --git a/gfs2/fsck/pass1c.c b/gfs2/fsck/pass1c.c
> index b918de1..ce9ca96 100644
> --- a/gfs2/fsck/pass1c.c
> +++ b/gfs2/fsck/pass1c.c
> @@ -7,6 +7,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "util.h"
> diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
> index c8c047e..2474ccb 100644
> --- a/gfs2/fsck/pass2.c
> +++ b/gfs2/fsck/pass2.c
> @@ -9,6 +9,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "util.h"
> diff --git a/gfs2/fsck/pass3.c b/gfs2/fsck/pass3.c
> index 6448da3..9582b5b 100644
> --- a/gfs2/fsck/pass3.c
> +++ b/gfs2/fsck/pass3.c
> @@ -8,6 +8,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "osi_list.h"
> #include "fsck.h"
> diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c
> index 311b96b..7b3cb87 100644
> --- a/gfs2/fsck/pass4.c
> +++ b/gfs2/fsck/pass4.c
> @@ -6,6 +6,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "lost_n_found.h"
> diff --git a/gfs2/fsck/pass5.c b/gfs2/fsck/pass5.c
> index 49ab682..68b1373 100644
> --- a/gfs2/fsck/pass5.c
> +++ b/gfs2/fsck/pass5.c
> @@ -7,6 +7,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "fsck.h"
> #include "util.h"
> diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
> index cb39541..0466dd8 100644
> --- a/gfs2/fsck/rgrepair.c
> +++ b/gfs2/fsck/rgrepair.c
> @@ -10,6 +10,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "osi_list.h"
> #include "fsck.h"
> diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c
> index f8ccb3e..8b439a9 100644
> --- a/gfs2/fsck/util.c
> +++ b/gfs2/fsck/util.c
> @@ -12,6 +12,7 @@
> #include <ctype.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "metawalk.h"
> #include "util.h"
> diff --git a/gfs2/include/Makefile.am b/gfs2/include/Makefile.am
> index a017cb3..c755181 100644
> --- a/gfs2/include/Makefile.am
> +++ b/gfs2/include/Makefile.am
> @@ -1,3 +1,3 @@
> MAINTAINERCLEANFILES = Makefile.in
>
> -noinst_HEADERS = osi_list.h osi_tree.h linux_endian.h
> +noinst_HEADERS = osi_list.h osi_tree.h linux_endian.h logging.h
> diff --git a/gfs2/include/logging.h b/gfs2/include/logging.h
> new file mode 100644
> index 0000000..18b5832
> --- /dev/null
> +++ b/gfs2/include/logging.h
> @@ -0,0 +1,36 @@
> +#ifndef __LOGGING_H__
> +#define __LOGGING_H__
> +
> +extern int print_level;
> +#define increase_verbosity() do { print_level++; } while(0)
> +#define decrease_verbosity() do { print_level--; } while(0)
> +
> +#define MSG_DEBUG 7
> +#define MSG_INFO 6
> +#define MSG_NOTICE 5
> +#define MSG_WARN 4
> +#define MSG_ERROR 3
> +#define MSG_CRITICAL 2
> +#define MSG_NULL 1
> +
> +#define log_debug(format...) \
> + do { if (print_level >= MSG_DEBUG) { \
> + printf("(%s:%d) ", __FUNCTION__, __LINE__); \
> + printf(format); } } while(0)
> +
> +#define log_info(format...) \
> + do { if (print_level >= MSG_INFO) printf(format); } while(0)
> +
> +#define log_notice(format...) \
> + do { if (print_level >= MSG_NOTICE) printf(format); } while(0)
> +
> +#define log_warn(format...) \
> + do { if (print_level >= MSG_WARN) printf(format); } while(0)
> +
> +#define log_err(format...) \
> + do { if (print_level >= MSG_ERROR) fprintf(stderr, format); } while(0)
> +
> +#define log_crit(format...) \
> + do { if (print_level >= MSG_CRITICAL) fprintf(stderr, format); } while(0)
> +
> +#endif /* __LOGGING_H__ */
> diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
> index 2d197f0..4af27be 100644
> --- a/gfs2/libgfs2/Makefile.am
> +++ b/gfs2/libgfs2/Makefile.am
> @@ -13,7 +13,7 @@ noinst_PROGRAMS = gfs2l
>
> libgfs2_la_SOURCES = block_list.c fs_bits.c gfs1.c misc.c rgrp.c super.c \
> buf.c fs_geometry.c gfs2_disk_hash.c ondisk.c config.c \
> - device_geometry.c fs_ops.c gfs2_log.c recovery.c \
> + device_geometry.c fs_ops.c recovery.c \
> structures.c meta.c lang.c parser.y lexer.l
>
> libgfs2_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \
> diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c
> index 9c9085f..587ceb8 100644
> --- a/gfs2/libgfs2/fs_geometry.c
> +++ b/gfs2/libgfs2/fs_geometry.c
> @@ -97,12 +97,12 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
> } else {
> uint64_t old_length, new_chunk;
>
> - log_info("Existing resource groups:\n");
> + printf("Existing resource groups:\n");
> for (rgrp = 0, n = osi_first(rgtree); n; n = next, rgrp++) {
> next = osi_next(n);
> rl = (struct rgrp_tree *)n;
>
> - log_info("%d: start: %" PRIu64 " (0x%"
> + printf("%d: start: %" PRIu64 " (0x%"
> PRIx64 "), length = %"PRIu64" (0x%"
> PRIx64 ")\n", rgrp + 1, rl->start, rl->start,
> rl->length, rl->length);
> @@ -118,7 +118,7 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
> }
>
> if (rgrp < nrgrp)
> - log_info("\nNew resource groups:\n");
> + printf("\nNew resource groups:\n");
> for (; rgrp < nrgrp; rgrp++) {
> if (rgrp) {
> rgaddr = rlast->start + rlast->length;
> @@ -131,7 +131,7 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
> (nrgrp - 1) * (dev->length / nrgrp);
> }
> rl->start = rgaddr;
> - log_info("%d: start: %" PRIu64 " (0x%"
> + printf("%d: start: %" PRIu64 " (0x%"
> PRIx64 "), length = %"PRIu64" (0x%"
> PRIx64 ")\n", rgrp + 1, rl->start, rl->start,
> rl->length, rl->length);
> diff --git a/gfs2/libgfs2/gfs2_log.c b/gfs2/libgfs2/gfs2_log.c
> deleted file mode 100644
> index da5f489..0000000
> --- a/gfs2/libgfs2/gfs2_log.c
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -#include "clusterautoconfig.h"
> -
> -#include <stdio.h>
> -#include <stdarg.h>
> -#include <ctype.h>
> -#include <sys/select.h>
> -#include <signal.h>
> -#include <string.h>
> -#include <termios.h>
> -#include <unistd.h>
> -
> -#include "libgfs2.h"
> -
> -int print_level = MSG_NOTICE;
> -
> -void increase_verbosity(void)
> -{
> - print_level++;
> -}
> -
> -void decrease_verbosity(void)
> -{
> - print_level--;
> -}
> diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
> index b269357..041e5fd 100644
> --- a/gfs2/libgfs2/libgfs2.h
> +++ b/gfs2/libgfs2/libgfs2.h
> @@ -671,40 +671,6 @@ extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf);
> extern void gfs_rgrp_in(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
> extern void gfs_rgrp_out(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
>
> -/* gfs2_log.c */
> -
> -extern int print_level;
> -
> -#define MSG_DEBUG 7
> -#define MSG_INFO 6
> -#define MSG_NOTICE 5
> -#define MSG_WARN 4
> -#define MSG_ERROR 3
> -#define MSG_CRITICAL 2
> -#define MSG_NULL 1
> -
> -#define log_debug(format...) \
> - do { if (print_level >= MSG_DEBUG) { \
> - printf("(%s:%d) ", __FUNCTION__, __LINE__); \
> - printf(format); } } while(0)
> -
> -#define log_info(format...) \
> - do { if (print_level >= MSG_INFO) printf(format); } while(0)
> -
> -#define log_notice(format...) \
> - do { if (print_level >= MSG_NOTICE) printf(format); } while(0)
> -
> -#define log_warn(format...) \
> - do { if (print_level >= MSG_WARN) printf(format); } while(0)
> -
> -#define log_err(format...) \
> - do { if (print_level >= MSG_ERROR) fprintf(stderr, format); } while(0)
> -
> -#define log_crit(format...) \
> - do { if (print_level >= MSG_CRITICAL) fprintf(stderr, format); } while(0)
> -
> -extern void increase_verbosity(void);
> -extern void decrease_verbosity(void);
> /* misc.c */
>
> extern int metafs_interrupted;
> diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
> index 7e005e9..5da809a 100644
> --- a/gfs2/mkfs/main_grow.c
> +++ b/gfs2/mkfs/main_grow.c
> @@ -23,6 +23,7 @@
> #include <libintl.h>
> #define _(String) gettext(String)
>
> +#include <logging.h>
> #include "libgfs2.h"
> #include "gfs2_mkfs.h"
>
> @@ -33,6 +34,7 @@ static uint64_t override_device_size = 0;
> static int test = 0;
> static uint64_t fssize = 0, fsgrowth;
> static unsigned int rgsize = 0;
> +int print_level = MSG_NOTICE;
>
> extern int create_new_inode(struct gfs2_sbd *sdp);
> extern int rename2system(struct gfs2_sbd *sdp, char *new_dir, char *new_name);
next prev parent reply other threads:[~2014-05-07 14:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-07 14:33 [Cluster-devel] [PATCH 1/5] fsck.gfs2: Log to syslog on start and exit Andrew Price
2014-05-07 14:33 ` [Cluster-devel] [PATCH 2/5] gfs2-utils: Expressly expunge 'expert mode' Andrew Price
2014-05-07 14:48 ` Bob Peterson
2014-05-07 15:01 ` Andrew Price
2014-05-07 14:33 ` [Cluster-devel] [PATCH 3/5] libgfs2: Remove UI fields from struct gfs2_sbd Andrew Price
2014-05-07 14:33 ` [Cluster-devel] [PATCH 4/5] libgfs2: Remove debug field from gfs2_sbd Andrew Price
2014-05-07 14:33 ` [Cluster-devel] [PATCH 5/5] libgfs2: Remove logging API Andrew Price
2014-05-07 14:48 ` Steven Whitehouse [this message]
2014-05-07 14:55 ` Bob Peterson
2014-05-07 15:07 ` Andrew Price
2014-05-07 15:17 ` Andrew Price
2014-05-07 14:39 ` [Cluster-devel] [PATCH 1/5] fsck.gfs2: Log to syslog on start and exit Steven Whitehouse
2014-05-07 15:15 ` Andrew Price
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=536A47C0.7080806@redhat.com \
--to=swhiteho@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.