From 9348ca1602ce9d140a215e92852b4b5fe26a2013 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 18 Apr 2017 16:22:22 +0200 Subject: [PATCH] eal: remove log level from internal config This field is only used in the initialization phase. Remove it since the global log level can also be retrieved using a public API: rte_log_get_global_level(). Signed-off-by: Olivier Matz Acked-by: Ferruh Yigit --- lib/librte_eal/bsdapp/eal/eal.c | 2 -- lib/librte_eal/common/eal_common_log.c | 6 ++++++ lib/librte_eal/common/eal_common_options.c | 11 ++--------- lib/librte_eal/common/eal_internal_cfg.h | 1 - lib/librte_eal/linuxapp/eal/eal.c | 2 -- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index ed16c2e589..05f0c1f90d 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -323,8 +323,6 @@ eal_log_level_parse(int argc, char **argv) optind = 1; optreset = 1; - rte_log_set_global_level(internal_config.log_level); - while ((opt = getopt_long(argc, argvopt, eal_short_options, eal_long_options, &option_index)) != EOF) { diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index ddc99bda77..fcc28a969b 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -282,6 +282,12 @@ rte_log_init(void) { uint32_t i; +#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG + rte_log_set_global_level(RTE_LOG_INFO); +#else + rte_log_set_global_level(RTE_LOG_LEVEL); +#endif + rte_logs.dynamic_types = calloc(RTE_LOGTYPE_FIRST_EXT_ID, sizeof(struct rte_log_dynamic_type)); if (rte_logs.dynamic_types == NULL) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 32df2ef458..e9b45c49a7 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -148,12 +148,6 @@ eal_reset_internal_config(struct internal_config *internal_cfg) internal_cfg->base_virtaddr = 0; internal_cfg->syslog_facility = LOG_DAEMON; - /* default value from build option */ -#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG - internal_cfg->log_level = RTE_LOG_INFO; -#else - internal_cfg->log_level = RTE_LOG_LEVEL; -#endif internal_cfg->xen_dom0_support = 0; @@ -739,7 +733,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf) } static int -eal_parse_log_level(const char *arg, struct internal_config *conf) +eal_parse_log_level(const char *arg) { char *end, *str, *type, *level; unsigned long tmp; @@ -772,7 +766,6 @@ eal_parse_log_level(const char *arg, struct internal_config *conf) type, tmp); if (type == NULL) { - conf->log_level = tmp; rte_log_set_global_level(tmp); } else if (rte_log_set_level_regexp(type, tmp) < 0) { printf("cannot set log level %s,%lu\n", @@ -926,7 +919,7 @@ eal_parse_common_option(int opt, const char *optarg, break; case OPT_LOG_LEVEL_NUM: { - if (eal_parse_log_level(optarg, conf) < 0) { + if (eal_parse_log_level(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" OPT_LOG_LEVEL "\n"); diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h index 5f1367eb7e..7b7e8c8872 100644 --- a/lib/librte_eal/common/eal_internal_cfg.h +++ b/lib/librte_eal/common/eal_internal_cfg.h @@ -78,7 +78,6 @@ struct internal_config { volatile uint64_t socket_mem[RTE_MAX_NUMA_NODES]; /**< amount of memory per socket */ uintptr_t base_virtaddr; /**< base address to try and reserve memory from */ volatile int syslog_facility; /**< facility passed to openlog() */ - volatile uint32_t log_level; /**< default log level */ /** default interrupt mode for VFIO */ volatile enum rte_intr_mode vfio_intr_mode; const char *hugefile_prefix; /**< the base filename of hugetlbfs files */ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index fbfbb94bab..7c78f2dc24 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -492,8 +492,6 @@ eal_log_level_parse(int argc, char **argv) argvopt = argv; optind = 1; - rte_log_set_global_level(internal_config.log_level); - while ((opt = getopt_long(argc, argvopt, eal_short_options, eal_long_options, &option_index)) != EOF) { -- 2.20.1