From 8e9bf1815df2455d994df622f5b43078193b4a84 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Thu, 30 Dec 2021 10:54:41 -0500 Subject: [PATCH] lib/log: move some log level function to log.c These set_level/get_level functions and REGISTER(log), have nothing to do with log_flag.c, why we put them there. I think we might as well put them to log.c. And "define MAX_TMPBUF 1024", repeated. Change-Id: I5ade71b923d61446a5f81f0d2f26fdc4a3057f02 Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10923 Reviewed-by: Paul Luse Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- lib/log/log.c | 32 ++++++++++++++++++++++++++++++-- lib/log/log_flags.c | 33 --------------------------------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 69dfdb464..e8fa93d0b 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -48,8 +48,36 @@ static const char *const spdk_level_names[] = { static logfunc *g_log = NULL; static bool g_log_timestamps = true; -extern enum spdk_log_level g_spdk_log_level; -extern enum spdk_log_level g_spdk_log_print_level; +enum spdk_log_level g_spdk_log_level; +enum spdk_log_level g_spdk_log_print_level; + +SPDK_LOG_REGISTER_COMPONENT(log) + +void +spdk_log_set_level(enum spdk_log_level level) +{ + assert(level >= SPDK_LOG_DISABLED); + assert(level <= SPDK_LOG_DEBUG); + g_spdk_log_level = level; +} + +enum spdk_log_level +spdk_log_get_level(void) { + return g_spdk_log_level; +} + +void +spdk_log_set_print_level(enum spdk_log_level level) +{ + assert(level >= SPDK_LOG_DISABLED); + assert(level <= SPDK_LOG_DEBUG); + g_spdk_log_print_level = level; +} + +enum spdk_log_level +spdk_log_get_print_level(void) { + return g_spdk_log_print_level; +} void spdk_log_open(logfunc *logf) diff --git a/lib/log/log_flags.c b/lib/log/log_flags.c index 9daffafc6..bcf9a19ae 100644 --- a/lib/log/log_flags.c +++ b/lib/log/log_flags.c @@ -37,39 +37,6 @@ static TAILQ_HEAD(, spdk_log_flag) g_log_flags = TAILQ_HEAD_INITIALIZER(g_log_flags); -enum spdk_log_level g_spdk_log_level = SPDK_LOG_NOTICE; -enum spdk_log_level g_spdk_log_print_level = SPDK_LOG_NOTICE; - -SPDK_LOG_REGISTER_COMPONENT(log) - -#define MAX_TMPBUF 1024 - -void -spdk_log_set_level(enum spdk_log_level level) -{ - assert(level >= SPDK_LOG_DISABLED); - assert(level <= SPDK_LOG_DEBUG); - g_spdk_log_level = level; -} - -enum spdk_log_level -spdk_log_get_level(void) { - return g_spdk_log_level; -} - -void -spdk_log_set_print_level(enum spdk_log_level level) -{ - assert(level >= SPDK_LOG_DISABLED); - assert(level <= SPDK_LOG_DEBUG); - g_spdk_log_print_level = level; -} - -enum spdk_log_level -spdk_log_get_print_level(void) { - return g_spdk_log_print_level; -} - static struct spdk_log_flag * get_log_flag(const char *name) {