Remove RTE_LOG_LEVEL config option, use existing RTE_LOG_DP_LEVEL config option for controlling datapath log level. RTE_LOG_LEVEL is no longer needed as dynamic logging can be used to control global and module specific log levels.
Signed-off-by: Pavan Nikhilesh <pbhagavat...@caviumnetworks.com> --- config/common_base | 1 - devtools/test-build.sh | 2 +- doc/guides/faq/faq.rst | 3 --- drivers/net/ena/base/ena_plat_dpdk.h | 2 +- drivers/net/sfc/sfc_debug.h | 2 +- examples/l3fwd-acl/main.c | 2 +- test/test/test.h | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/config/common_base b/config/common_base index e74febef4..e7af26cc8 100644 --- a/config/common_base +++ b/config/common_base @@ -94,7 +94,6 @@ CONFIG_RTE_MAX_MEMSEG=256 CONFIG_RTE_MAX_MEMZONE=2560 CONFIG_RTE_MAX_TAILQ=32 CONFIG_RTE_ENABLE_ASSERT=n -CONFIG_RTE_LOG_LEVEL=RTE_LOG_INFO CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO CONFIG_RTE_LOG_HISTORY=256 CONFIG_RTE_BACKTRACE=y diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 092d3a7f3..7e9e1e187 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -157,7 +157,7 @@ config () # <directory> <target> <options> ! echo $3 | grep -q '+shared' || \ sed -ri 's,(SHARED_LIB=)n,\1y,' $1/.config ! echo $3 | grep -q '+debug' || ( \ - sed -ri 's,(RTE_LOG_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config + sed -ri 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config sed -ri 's,(_DEBUG.*=)n,\1y,' $1/.config sed -ri 's,(_STAT.*=)n,\1y,' $1/.config sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) diff --git a/doc/guides/faq/faq.rst b/doc/guides/faq/faq.rst index dac805099..55dcfe9c2 100644 --- a/doc/guides/faq/faq.rst +++ b/doc/guides/faq/faq.rst @@ -103,9 +103,6 @@ Yes, the option ``--log-level=`` accepts one of these numbers: #define RTE_LOG_INFO 7U /* Informational. */ #define RTE_LOG_DEBUG 8U /* Debug-level messages. */ -It is also possible to change the default level at compile time -with ``CONFIG_RTE_LOG_LEVEL``. - How can I tune my network application to achieve lower latency? --------------------------------------------------------------- diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index accecf518..8cba319eb 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -96,7 +96,7 @@ typedef uint64_t dma_addr_t; #define ENA_GET_SYSTEM_USECS() \ (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz()) -#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG +#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG #define ENA_ASSERT(cond, format, arg...) \ do { \ if (unlikely(!(cond))) { \ diff --git a/drivers/net/sfc/sfc_debug.h b/drivers/net/sfc/sfc_debug.h index 92eba9c38..3f9ccf1e6 100644 --- a/drivers/net/sfc/sfc_debug.h +++ b/drivers/net/sfc/sfc_debug.h @@ -35,7 +35,7 @@ #include <rte_debug.h> #ifdef RTE_LIBRTE_SFC_EFX_DEBUG -/* Avoid dependency from RTE_LOG_LEVEL to be able to enable debug check +/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check * in the driver only. */ #define SFC_ASSERT(exp) RTE_VERIFY(exp) diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index e50b1a1a8..eb78decdd 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -68,7 +68,7 @@ #include <rte_string_fns.h> #include <rte_acl.h> -#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG +#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG #define L3FWDACL_DEBUG #endif #define DO_RFC_1812_CHECKS diff --git a/test/test/test.h b/test/test/test.h index 08ffe949c..8fdb3045e 100644 --- a/test/test/test.h +++ b/test/test/test.h @@ -204,7 +204,7 @@ struct unit_test_case { #define TEST_CASES_END() { NULL, NULL, NULL, NULL, 0 } -#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG +#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG #define TEST_HEXDUMP(file, title, buf, len) rte_hexdump(file, title, buf, len) #else #define TEST_HEXDUMP(file, title, buf, len) do {} while (0) -- 2.14.1