[logging] refine FULL_LOGS option (#6084)

This commits refine the FULL_LOGS option (OT_FULL_LOGS for cmake):
- remove configuration of log regions since they should be 1 by
  default
- set PLATFORM log region to ON by default

etc/cmake/options.cmake

@@ -302,28 +302,8 @@ if(OT_FULL_LOGS)
     if(NOT OT_LOG_LEVEL)
         target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG")
     endif()
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_API=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_ARP=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_BBR=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_BR=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_CLI=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_COAP=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_DNS=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_DUA=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_ICMP=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_IP6=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_MAC=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_MEM=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_MESHCOP=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_MLE=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_MLR=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_NETDATA=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_NETDIAG=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_PKT_DUMP=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_PLATFORM=1")
     target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1")
     target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_PREPEND_REGION=1")
-    target_compile_definitions(ot-config INTERFACE "OPENTHREAD_CONFIG_LOG_SRP=1")
 endif()
 
 option(OT_OTNS "enable OTNS support")

examples/common-switches.mk

@@ -329,31 +329,5 @@ endif
 COMMONCFLAGS += -DOPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT=${RCP_RESTORATION_MAX_COUNT}
 
 ifeq ($(FULL_LOGS),1)
-# HINT: Add more here, or comment out ones you do not need/want
+COMMONCFLAGS += -DOPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG -DOPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1 -DOPENTHREAD_CONFIG_LOG_PREPEND_REGION=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_API=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_ARP=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_BBR=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_BR=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_CLI=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_COAP=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_DNS=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_DUA=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_ICMP=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_IP6=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_MAC=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_MEM=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_MESHCOP=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_MLE=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_MLR=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_NETDATA=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_NETDIAG=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_PKT_DUMP=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_PLATFORM=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_PREPEND_REGION=1
-LOG_FLAGS += -DOPENTHREAD_CONFIG_LOG_SRP=1
 endif
-
-CFLAGS += ${LOG_FLAGS}
-CXXFLAGS += ${LOG_FLAGS}

script/test

@@ -48,6 +48,7 @@ readonly BORDER_ROUTING="${BORDER_ROUTING:-1}"
 readonly INTER_OP_BBR="${INTER_OP_BBR:-1}"
 
 readonly OT_COREDUMP_DIR="${PWD}/ot-core-dump"
+readonly FULL_LOGS=${FULL_LOGS:-0}
 
 build_simulation()
 {
@@ -62,6 +63,10 @@ build_simulation()
         "-DOT_SERVICE=ON"
         "-DOT_ECDSA=ON")
 
+    if [[ ${FULL_LOGS} == 1 ]]; then
+        options+=("-DOT_FULL_LOGS=ON")
+    fi
+
     if [[ ${version} == "1.2" ]]; then
         options+=("-DOT_DUA=ON")
         options+=("-DOT_MLR=ON")
@@ -106,6 +111,10 @@ build_posix()
         options+=("-DOT_MLR=ON")
     fi
 
+    if [[ ${FULL_LOGS} == 1 ]]; then
+        options+=("-DOT_FULL_LOGS=ON")
+    fi
+
     if [[ ${VIRTUAL_TIME} == 1 ]]; then
         options+=("-DOT_POSIX_VIRTUAL_TIME=ON")
     fi

src/core/BUILD.gn

@@ -237,31 +237,9 @@ if (openthread_enable_core_config_args) {
     }
 
     if (openthread_config_full_logs) {
-      defines += [
+      defines += [ "OPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG" ]
-        "OPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG",
+      defines += [ "OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1" ]
-        "OPENTHREAD_CONFIG_LOG_API=1",
+      defines += [ "OPENTHREAD_CONFIG_LOG_PREPEND_REGION=1" ]
-        "OPENTHREAD_CONFIG_LOG_ARP=1",
-        "OPENTHREAD_CONFIG_LOG_BBR=1",
-        "OPENTHREAD_CONFIG_LOG_BR=1",
-        "OPENTHREAD_CONFIG_LOG_CLI=1",
-        "OPENTHREAD_CONFIG_LOG_COAP=1",
-        "OPENTHREAD_CONFIG_LOG_DNS=1",
-        "OPENTHREAD_CONFIG_LOG_DUA=1",
-        "OPENTHREAD_CONFIG_LOG_ICMP=1",
-        "OPENTHREAD_CONFIG_LOG_IP6=1",
-        "OPENTHREAD_CONFIG_LOG_MAC=1",
-        "OPENTHREAD_CONFIG_LOG_MEM=1",
-        "OPENTHREAD_CONFIG_LOG_MESHCOP=1",
-        "OPENTHREAD_CONFIG_LOG_MLE=1",
-        "OPENTHREAD_CONFIG_LOG_MLR=1",
-        "OPENTHREAD_CONFIG_LOG_NETDATA=1",
-        "OPENTHREAD_CONFIG_LOG_NETDIAG=1",
-        "OPENTHREAD_CONFIG_LOG_PKT_DUMP=1",
-        "OPENTHREAD_CONFIG_LOG_PLATFORM=1",
-        "OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1",
-        "OPENTHREAD_CONFIG_LOG_PREPEND_REGION=1",
-        "OPENTHREAD_CONFIG_LOG_SRP=1",
-      ]
     }
 
     if (openthread_config_otns_enable) {

src/core/config/logging.h

@@ -220,7 +220,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_LOG_PLATFORM
-#define OPENTHREAD_CONFIG_LOG_PLATFORM 0
+#define OPENTHREAD_CONFIG_LOG_PLATFORM 1
 #endif
 
 /**