[dpdk-dev,v2,3/3] logs: remove log level config option

Message ID 20171209132358.24263-3-pbhagavatula@caviumnetworks.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Pavan Nikhilesh Dec. 9, 2017, 1:23 p.m. UTC
  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 <pbhagavatula@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 +-
 6 files changed, 4 insertions(+), 8 deletions(-)
  

Comments

Olivier Matz Dec. 12, 2017, 4:36 p.m. UTC | #1
On Sat, Dec 09, 2017 at 06:53:58PM +0530, Pavan Nikhilesh wrote:
> 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 <pbhagavatula@caviumnetworks.com>

Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
  
Thomas Monjalon Jan. 12, 2018, 3:46 p.m. UTC | #2
12/12/2017 17:36, Olivier MATZ:
> On Sat, Dec 09, 2017 at 06:53:58PM +0530, Pavan Nikhilesh wrote:
> > 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 <pbhagavatula@caviumnetworks.com>
> 
> Reviewed-by: Olivier Matz <olivier.matz@6wind.com>

It breaks compilation of test/ directory.
Please check git grep RTE_LOG_LEVEL
  
Pavan Nikhilesh Jan. 12, 2018, 3:52 p.m. UTC | #3
Hi Thomas,

The patchset depends on the following patchset
http://dpdk.org/dev/patchwork/patch/32038/

Thanks,
Pavan

On Fri, Jan 12, 2018 at 04:46:47PM +0100, Thomas Monjalon wrote:
> 12/12/2017 17:36, Olivier MATZ:
> > On Sat, Dec 09, 2017 at 06:53:58PM +0530, Pavan Nikhilesh wrote:
> > > 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 <pbhagavatula@caviumnetworks.com>
> >
> > Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
>
> It breaks compilation of test/ directory.
> Please check git grep RTE_LOG_LEVEL
  
Thomas Monjalon Jan. 12, 2018, 4:08 p.m. UTC | #4
12/01/2018 16:52, Pavan Nikhilesh:
> Hi Thomas,
> 
> The patchset depends on the following patchset
> http://dpdk.org/dev/patchwork/patch/32038/

OK thanks !
  
Thomas Monjalon Jan. 17, 2018, 1:22 p.m. UTC | #5
12/12/2017 17:36, Olivier MATZ:
> On Sat, Dec 09, 2017 at 06:53:58PM +0530, Pavan Nikhilesh wrote:
> > 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 <pbhagavatula@caviumnetworks.com>
> 
> Reviewed-by: Olivier Matz <olivier.matz@6wind.com>

Series applied, thanks
  

Patch

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