diff --git a/include/openthread/instance.h b/include/openthread/instance.h index 9953f9531..30797de4e 100644 --- a/include/openthread/instance.h +++ b/include/openthread/instance.h @@ -53,7 +53,7 @@ extern "C" { * @note This number versions both OpenThread platform and user APIs. * */ -#define OPENTHREAD_API_VERSION (180) +#define OPENTHREAD_API_VERSION (181) /** * @addtogroup api-instance diff --git a/include/openthread/platform/logging.h b/include/openthread/platform/logging.h index acf88cd22..4c62744c3 100644 --- a/include/openthread/platform/logging.h +++ b/include/openthread/platform/logging.h @@ -157,9 +157,6 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat /** * This (optional) platform function outputs a prepared log line. * - * This platform function is used by OpenThread core when `OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY` is not enabled - * (in this case, the OT core itself will prepare a full log line). - * * Note that this function is optional and if not provided by platform layer, a default (weak) implementation is * provided and used by OpenThread core as `otPlatLog(aLogLevel, aLogResion, "%s", aLogLine)`. * diff --git a/script/check-simulation-build-autotools b/script/check-simulation-build-autotools index 2511bafe0..2280dc5c2 100755 --- a/script/check-simulation-build-autotools +++ b/script/check-simulation-build-autotools @@ -106,10 +106,6 @@ build_all_features() reset_source make -f examples/Makefile-simulation THREAD_VERSION=1.1 FULL_LOGS=1 - # Build Thread 1.1 with full features and full logs (Logs defined as macros) - export CPPFLAGS="${options[*]} -DOPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY=1" - make -f examples/Makefile-simulation THREAD_VERSION=1.1 FULL_LOGS=1 - # Build Thread 1.2 with full features and logs export CPPFLAGS="${options[*]} ${options_1_2[*]} -DOPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_NONE" reset_source diff --git a/src/core/common/logging.cpp b/src/core/common/logging.cpp index 525a41510..af450944c 100644 --- a/src/core/common/logging.cpp +++ b/src/core/common/logging.cpp @@ -58,8 +58,6 @@ extern "C" { #endif -#if !OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY - static void Log(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, va_list aArgs) { ot::String logString; @@ -74,31 +72,34 @@ static void Log(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aForma #endif #if OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL - logString.Append("%s", otLogLevelToPrefixString(aLogLevel)); + + { + static const char *const kLevelStrings[] = { + "NONE", "CRIT", "WARN", "NOTE", "INFO", "DEBG", + }; + + uint16_t index = ((aLogLevel >= 0) && (aLogLevel < static_cast(OT_ARRAY_LENGTH(kLevelStrings)))) + ? static_cast(aLogLevel) + : 0; + + logString.Append("[%s]", kLevelStrings[index]); + } #endif #if OPENTHREAD_CONFIG_LOG_PREPEND_REGION { - static const char *const kRegionPrefixStrings[] = { - _OT_REGION_SUFFIX, _OT_REGION_API_PREFIX, _OT_REGION_MLE_PREFIX, _OT_REGION_ARP_PREFIX, - _OT_REGION_NET_DATA_PREFIX, _OT_REGION_ICMP_PREFIX, _OT_REGION_IP6_PREFIX, _OT_REGION_TCP_PREFIX, - _OT_REGION_MAC_PREFIX, _OT_REGION_MEM_PREFIX, _OT_REGION_NCP_PREFIX, _OT_REGION_MESH_COP_PREFIX, - _OT_REGION_NET_DIAG_PREFIX, _OT_REGION_PLATFORM_PREFIX, _OT_REGION_COAP_PREFIX, _OT_REGION_CLI_PREFIX, - _OT_REGION_CORE_PREFIX, _OT_REGION_UTIL_PREFIX, _OT_REGION_BBR_PREFIX, _OT_REGION_MLR_PREFIX, - _OT_REGION_DUA_PREFIX, _OT_REGION_BR_PREFIX, _OT_REGION_SRP_PREFIX, _OT_REGION_DNS_PREFIX, + static const char *const kRegionStrings[] = { + "-------", "API----", "MLE----", "ARP----", "N-DATA-", "ICMP---", "IP6----", "TCP----", + "MAC----", "MEM----", "NCP----", "MESH-CP", "DIAG---", "PLAT---", "COAP---", "CLI----", + "CORE---", "UTIL---", "BBR----", "MLR----", "DUA----", "BR-----", "SRP----", "DNS----", }; - if (aLogRegion < OT_ARRAY_LENGTH(kRegionPrefixStrings)) - { - logString.Append("%s", kRegionPrefixStrings[aLogRegion]); - } - else - { - logString.Append("%s", _OT_REGION_SUFFIX); - } + uint16_t index = (aLogRegion < OT_ARRAY_LENGTH(kRegionStrings)) ? static_cast(aLogRegion) : 0; + + logString.Append("-%s-: ", kRegionStrings[index]); } -#else - logString.Append("%s", _OT_REGION_SUFFIX); +#elif OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL + logString.Append(": "); #endif logString.AppendVarArgs(aFormat, aArgs); @@ -218,14 +219,8 @@ void otLogOtns(const char *aFormat, ...) } #endif -#endif // #if !OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY - #if OPENTHREAD_CONFIG_LOG_PKT_DUMP -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogDump(aLogLevel, aLogRegion, aFormat, ...) \ - _otDynamicLog(aLogLevel, aLogRegion, aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, __VA_ARGS__) -#else static void otLogDump(otLogLevel aLogLevel, otLogRegion aRegion, const char *aFormat, ...) { va_list args; @@ -239,7 +234,6 @@ static void otLogDump(otLogLevel aLogLevel, otLogRegion aRegion, const char *aFo exit: return; } -#endif static constexpr uint8_t kStringLineLength = 80; static constexpr uint8_t kDumpBytesPerLine = 16; @@ -337,21 +331,6 @@ void otDump(otLogLevel, otLogRegion, const char *, const void *, const size_t) } #endif // OPENTHREAD_CONFIG_LOG_PKT_DUMP -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY || OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL - -const char *otLogLevelToPrefixString(otLogLevel aLogLevel) -{ - static const char *const kLevelStrings[] = { - _OT_LEVEL_NONE_PREFIX, _OT_LEVEL_CRIT_PREFIX, _OT_LEVEL_WARN_PREFIX, - _OT_LEVEL_NOTE_PREFIX, _OT_LEVEL_INFO_PREFIX, _OT_LEVEL_DEBG_PREFIX, - }; - - return ((aLogLevel >= 0) && (aLogLevel < static_cast(OT_ARRAY_LENGTH(kLevelStrings)))) - ? kLevelStrings[aLogLevel] - : ""; -} -#endif - #if OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NONE /* this provides a stub, in case something uses the function */ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...) diff --git a/src/core/common/logging.hpp b/src/core/common/logging.hpp index 21243df80..ea9b69881 100644 --- a/src/core/common/logging.hpp +++ b/src/core/common/logging.hpp @@ -48,86 +48,6 @@ extern "C" { #endif -/** - * Log level prefix string definitions. - * - */ -#if OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL -#define _OT_LEVEL_NONE_PREFIX "[NONE]" -#define _OT_LEVEL_CRIT_PREFIX "[CRIT]" -#define _OT_LEVEL_WARN_PREFIX "[WARN]" -#define _OT_LEVEL_NOTE_PREFIX "[NOTE]" -#define _OT_LEVEL_INFO_PREFIX "[INFO]" -#define _OT_LEVEL_DEBG_PREFIX "[DEBG]" -#define _OT_REGION_SUFFIX ": " -#else -#define _OT_LEVEL_NONE_PREFIX "" -#define _OT_LEVEL_CRIT_PREFIX "" -#define _OT_LEVEL_WARN_PREFIX "" -#define _OT_LEVEL_NOTE_PREFIX "" -#define _OT_LEVEL_INFO_PREFIX "" -#define _OT_LEVEL_DEBG_PREFIX "" -#define _OT_REGION_SUFFIX "" -#endif - -/** - * Log region prefix string definitions. - * - */ -#if OPENTHREAD_CONFIG_LOG_PREPEND_REGION -#define _OT_REGION_API_PREFIX "-API-----: " -#define _OT_REGION_MLE_PREFIX "-MLE-----: " -#define _OT_REGION_ARP_PREFIX "-ARP-----: " -#define _OT_REGION_NET_DATA_PREFIX "-N-DATA--: " -#define _OT_REGION_ICMP_PREFIX "-ICMP----: " -#define _OT_REGION_IP6_PREFIX "-IP6-----: " -#define _OT_REGION_TCP_PREFIX "-TCP-----: " -#define _OT_REGION_MAC_PREFIX "-MAC-----: " -#define _OT_REGION_MEM_PREFIX "-MEM-----: " -#define _OT_REGION_NCP_PREFIX "-NCP-----: " -#define _OT_REGION_MESH_COP_PREFIX "-MESH-CP-: " -#define _OT_REGION_NET_DIAG_PREFIX "-DIAG----: " -#define _OT_REGION_PLATFORM_PREFIX "-PLAT----: " -#define _OT_REGION_COAP_PREFIX "-COAP----: " -#define _OT_REGION_CLI_PREFIX "-CLI-----: " -#define _OT_REGION_CORE_PREFIX "-CORE----: " -#define _OT_REGION_UTIL_PREFIX "-UTIL----: " -#define _OT_REGION_BBR_PREFIX "-BBR-----: " -#define _OT_REGION_MLR_PREFIX "-MLR-----: " -#define _OT_REGION_DUA_PREFIX "-DUA-----: " -#define _OT_REGION_BR_PREFIX "-BR------: " -#define _OT_REGION_SRP_PREFIX "-SRP-----: " -#define _OT_REGION_DNS_PREFIX "-DNS-----: " - -// When adding a new log region, please ensure to update the array -// `kRegionPrefixStrings[]` in `Log()` function in `logging.cpp`. - -#else -#define _OT_REGION_API_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_MLE_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_ARP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_NET_DATA_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_ICMP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_IP6_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_TCP_PREFIX _OT_REGION_PREFIX -#define _OT_REGION_MAC_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_MEM_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_NCP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_MESH_COP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_NET_DIAG_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_PLATFORM_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_COAP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_CLI_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_CORE_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_UTIL_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_BBR_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_MLR_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_DUA_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_BR_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_SRP_PREFIX _OT_REGION_SUFFIX -#define _OT_REGION_DNS_PREFIX _OT_REGION_SUFFIX -#endif - /** * @def otLogCrit * @@ -138,12 +58,9 @@ extern "C" { * */ #if OPENTHREAD_CONFIG_LOG_LEVEL < OT_LOG_LEVEL_CRIT -#define otLogCrit(aRegion, aRegionPrefix, ...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogCrit(aRegion, aRegionPrefix, ...) \ - _otLogFormatter(OT_LOG_LEVEL_CRIT, aRegion, _OT_LEVEL_CRIT_PREFIX aRegionPrefix __VA_ARGS__) +#define otLogCrit(aRegion, ...) #else -#define otLogCrit(aRegion, aRegionPrefix, ...) _otLogCrit(aRegion, __VA_ARGS__) +#define otLogCrit(aRegion, ...) _otLogCrit(aRegion, __VA_ARGS__) void _otLogCrit(otLogRegion aRegion, const char *aFormat, ...); #endif @@ -157,12 +74,9 @@ void _otLogCrit(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_LEVEL < OT_LOG_LEVEL_WARN -#define otLogWarn(aRegion, aRegionPrefix, ...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogWarn(aRegion, aRegionPrefix, ...) \ - _otLogFormatter(OT_LOG_LEVEL_WARN, aRegion, _OT_LEVEL_WARN_PREFIX aRegionPrefix __VA_ARGS__) +#define otLogWarn(aRegion, ...) #else -#define otLogWarn(aRegion, aRegionPrefix, ...) _otLogWarn(aRegion, __VA_ARGS__) +#define otLogWarn(aRegion, ...) _otLogWarn(aRegion, __VA_ARGS__) void _otLogWarn(otLogRegion aRegion, const char *aFormat, ...); #endif @@ -176,12 +90,9 @@ void _otLogWarn(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_LEVEL < OT_LOG_LEVEL_NOTE -#define otLogNote(aRegion, aRegionPrefix, ...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogNote(aRegion, aRegionPrefix, ...) \ - _otLogFormatter(OT_LOG_LEVEL_NOTE, aRegion, _OT_LEVEL_NOTE_PREFIX aRegionPrefix __VA_ARGS__) +#define otLogNote(aRegion, ...) #else -#define otLogNote(aRegion, aRegionPrefix, ...) _otLogNote(aRegion, __VA_ARGS__) +#define otLogNote(aRegion, ...) _otLogNote(aRegion, __VA_ARGS__) void _otLogNote(otLogRegion aRegion, const char *aFormat, ...); #endif @@ -195,12 +106,9 @@ void _otLogNote(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_LEVEL < OT_LOG_LEVEL_INFO -#define otLogInfo(aRegion, aRegionPrefix, ...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogInfo(aRegion, aRegionPrefix, ...) \ - _otLogFormatter(OT_LOG_LEVEL_INFO, aRegion, _OT_LEVEL_INFO_PREFIX aRegionPrefix __VA_ARGS__) +#define otLogInfo(aRegion, ...) #else -#define otLogInfo(aRegion, aRegionPrefix, ...) _otLogInfo(aRegion, __VA_ARGS__) +#define otLogInfo(aRegion, ...) _otLogInfo(aRegion, __VA_ARGS__) void _otLogInfo(otLogRegion aRegion, const char *aFormat, ...); #endif @@ -214,12 +122,9 @@ void _otLogInfo(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_LEVEL < OT_LOG_LEVEL_DEBG -#define otLogDebg(aRegion, aRegionPrefix, ...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogDebg(aRegion, aRegionPrefix, ...) \ - _otLogFormatter(OT_LOG_LEVEL_DEBG, aRegion, _OT_LEVEL_DEBG_PREFIX aRegionPrefix __VA_ARGS__) +#define otLogDebg(aRegion, ...) #else -#define otLogDebg(aRegion, aRegionPrefix, ...) _otLogDebg(aRegion, __VA_ARGS__) +#define otLogDebg(aRegion, ...) _otLogDebg(aRegion, __VA_ARGS__) void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); #endif @@ -268,11 +173,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_API -#define otLogCritApi(...) otLogCrit(OT_LOG_REGION_API, _OT_REGION_API_PREFIX, __VA_ARGS__) -#define otLogWarnApi(...) otLogWarn(OT_LOG_REGION_API, _OT_REGION_API_PREFIX, __VA_ARGS__) -#define otLogNoteApi(...) otLogNote(OT_LOG_REGION_API, _OT_REGION_API_PREFIX, __VA_ARGS__) -#define otLogInfoApi(...) otLogInfo(OT_LOG_REGION_API, _OT_REGION_API_PREFIX, __VA_ARGS__) -#define otLogDebgApi(...) otLogDebg(OT_LOG_REGION_API, _OT_REGION_API_PREFIX, __VA_ARGS__) +#define otLogCritApi(...) otLogCrit(OT_LOG_REGION_API, __VA_ARGS__) +#define otLogWarnApi(...) otLogWarn(OT_LOG_REGION_API, __VA_ARGS__) +#define otLogNoteApi(...) otLogNote(OT_LOG_REGION_API, __VA_ARGS__) +#define otLogInfoApi(...) otLogInfo(OT_LOG_REGION_API, __VA_ARGS__) +#define otLogDebgApi(...) otLogDebg(OT_LOG_REGION_API, __VA_ARGS__) #else #define otLogCritApi(...) #define otLogWarnApi(...) @@ -327,11 +232,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_MESHCOP -#define otLogCritMeshCoP(...) otLogCrit(OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX, __VA_ARGS__) -#define otLogWarnMeshCoP(...) otLogWarn(OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX, __VA_ARGS__) -#define otLogNoteMeshCoP(...) otLogNote(OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX, __VA_ARGS__) -#define otLogInfoMeshCoP(...) otLogInfo(OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX, __VA_ARGS__) -#define otLogDebgMeshCoP(...) otLogDebg(OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX, __VA_ARGS__) +#define otLogCritMeshCoP(...) otLogCrit(OT_LOG_REGION_MESH_COP, __VA_ARGS__) +#define otLogWarnMeshCoP(...) otLogWarn(OT_LOG_REGION_MESH_COP, __VA_ARGS__) +#define otLogNoteMeshCoP(...) otLogNote(OT_LOG_REGION_MESH_COP, __VA_ARGS__) +#define otLogInfoMeshCoP(...) otLogInfo(OT_LOG_REGION_MESH_COP, __VA_ARGS__) +#define otLogDebgMeshCoP(...) otLogDebg(OT_LOG_REGION_MESH_COP, __VA_ARGS__) #else #define otLogCritMeshCoP(...) #define otLogWarnMeshCoP(...) @@ -391,11 +296,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_BR -#define otLogCritBr(...) otLogCrit(OT_LOG_REGION_BR, _OT_REGION_BR_PREFIX, __VA_ARGS__) -#define otLogWarnBr(...) otLogWarn(OT_LOG_REGION_BR, _OT_REGION_BR_PREFIX, __VA_ARGS__) -#define otLogNoteBr(...) otLogNote(OT_LOG_REGION_BR, _OT_REGION_BR_PREFIX, __VA_ARGS__) -#define otLogInfoBr(...) otLogInfo(OT_LOG_REGION_BR, _OT_REGION_BR_PREFIX, __VA_ARGS__) -#define otLogDebgBr(...) otLogDebg(OT_LOG_REGION_BR, _OT_REGION_BR_PREFIX, __VA_ARGS__) +#define otLogCritBr(...) otLogCrit(OT_LOG_REGION_BR, __VA_ARGS__) +#define otLogWarnBr(...) otLogWarn(OT_LOG_REGION_BR, __VA_ARGS__) +#define otLogNoteBr(...) otLogNote(OT_LOG_REGION_BR, __VA_ARGS__) +#define otLogInfoBr(...) otLogInfo(OT_LOG_REGION_BR, __VA_ARGS__) +#define otLogDebgBr(...) otLogDebg(OT_LOG_REGION_BR, __VA_ARGS__) #else #define otLogCritBr(...) #define otLogWarnBr(...) @@ -450,11 +355,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_MLE -#define otLogCritMle(...) otLogCrit(OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX, __VA_ARGS__) -#define otLogWarnMle(...) otLogWarn(OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX, __VA_ARGS__) -#define otLogNoteMle(...) otLogNote(OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX, __VA_ARGS__) -#define otLogInfoMle(...) otLogInfo(OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX, __VA_ARGS__) -#define otLogDebgMle(...) otLogDebg(OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX, __VA_ARGS__) +#define otLogCritMle(...) otLogCrit(OT_LOG_REGION_MLE, __VA_ARGS__) +#define otLogWarnMle(...) otLogWarn(OT_LOG_REGION_MLE, __VA_ARGS__) +#define otLogNoteMle(...) otLogNote(OT_LOG_REGION_MLE, __VA_ARGS__) +#define otLogInfoMle(...) otLogInfo(OT_LOG_REGION_MLE, __VA_ARGS__) +#define otLogDebgMle(...) otLogDebg(OT_LOG_REGION_MLE, __VA_ARGS__) #else #define otLogCritMle(...) #define otLogWarnMle(...) @@ -508,11 +413,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_ARP -#define otLogCritArp(...) otLogCrit(OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX, __VA_ARGS__) -#define otLogWarnArp(...) otLogWarn(OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX, __VA_ARGS__) -#define otLogNoteArp(...) otLogNote(OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX, __VA_ARGS__) -#define otLogInfoArp(...) otLogInfo(OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX, __VA_ARGS__) -#define otLogDebgArp(...) otLogDebg(OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX, __VA_ARGS__) +#define otLogCritArp(...) otLogCrit(OT_LOG_REGION_ARP, __VA_ARGS__) +#define otLogWarnArp(...) otLogWarn(OT_LOG_REGION_ARP, __VA_ARGS__) +#define otLogNoteArp(...) otLogNote(OT_LOG_REGION_ARP, __VA_ARGS__) +#define otLogInfoArp(...) otLogInfo(OT_LOG_REGION_ARP, __VA_ARGS__) +#define otLogDebgArp(...) otLogDebg(OT_LOG_REGION_ARP, __VA_ARGS__) #else #define otLogCritArp(...) #define otLogWarnArp(...) @@ -566,11 +471,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_BBR -#define otLogCritBbr(...) otLogCrit(OT_LOG_REGION_BBR, _OT_REGION_BBR_PREFIX, __VA_ARGS__) -#define otLogWarnBbr(...) otLogWarn(OT_LOG_REGION_BBR, _OT_REGION_BBR_PREFIX, __VA_ARGS__) -#define otLogNoteBbr(...) otLogNote(OT_LOG_REGION_BBR, _OT_REGION_BBR_PREFIX, __VA_ARGS__) -#define otLogInfoBbr(...) otLogInfo(OT_LOG_REGION_BBR, _OT_REGION_BBR_PREFIX, __VA_ARGS__) -#define otLogDebgBbr(...) otLogDebg(OT_LOG_REGION_BBR, _OT_REGION_BBR_PREFIX, __VA_ARGS__) +#define otLogCritBbr(...) otLogCrit(OT_LOG_REGION_BBR, __VA_ARGS__) +#define otLogWarnBbr(...) otLogWarn(OT_LOG_REGION_BBR, __VA_ARGS__) +#define otLogNoteBbr(...) otLogNote(OT_LOG_REGION_BBR, __VA_ARGS__) +#define otLogInfoBbr(...) otLogInfo(OT_LOG_REGION_BBR, __VA_ARGS__) +#define otLogDebgBbr(...) otLogDebg(OT_LOG_REGION_BBR, __VA_ARGS__) #else #define otLogCritBbr(...) #define otLogWarnBbr(...) @@ -624,11 +529,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_MLR -#define otLogCritMlr(...) otLogCrit(OT_LOG_REGION_MLR, _OT_REGION_MLR_PREFIX, __VA_ARGS__) -#define otLogWarnMlr(...) otLogWarn(OT_LOG_REGION_MLR, _OT_REGION_MLR_PREFIX, __VA_ARGS__) -#define otLogNoteMlr(...) otLogNote(OT_LOG_REGION_MLR, _OT_REGION_MLR_PREFIX, __VA_ARGS__) -#define otLogInfoMlr(...) otLogInfo(OT_LOG_REGION_MLR, _OT_REGION_MLR_PREFIX, __VA_ARGS__) -#define otLogDebgMlr(...) otLogDebg(OT_LOG_REGION_MLR, _OT_REGION_MLR_PREFIX, __VA_ARGS__) +#define otLogCritMlr(...) otLogCrit(OT_LOG_REGION_MLR, __VA_ARGS__) +#define otLogWarnMlr(...) otLogWarn(OT_LOG_REGION_MLR, __VA_ARGS__) +#define otLogNoteMlr(...) otLogNote(OT_LOG_REGION_MLR, __VA_ARGS__) +#define otLogInfoMlr(...) otLogInfo(OT_LOG_REGION_MLR, __VA_ARGS__) +#define otLogDebgMlr(...) otLogDebg(OT_LOG_REGION_MLR, __VA_ARGS__) #else #define otLogCritMlr(...) #define otLogWarnMlr(...) @@ -682,11 +587,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_NETDATA -#define otLogCritNetData(...) otLogCrit(OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX, __VA_ARGS__) -#define otLogWarnNetData(...) otLogWarn(OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX, __VA_ARGS__) -#define otLogNoteNetData(...) otLogNote(OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX, __VA_ARGS__) -#define otLogInfoNetData(...) otLogInfo(OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX, __VA_ARGS__) -#define otLogDebgNetData(...) otLogDebg(OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX, __VA_ARGS__) +#define otLogCritNetData(...) otLogCrit(OT_LOG_REGION_NET_DATA, __VA_ARGS__) +#define otLogWarnNetData(...) otLogWarn(OT_LOG_REGION_NET_DATA, __VA_ARGS__) +#define otLogNoteNetData(...) otLogNote(OT_LOG_REGION_NET_DATA, __VA_ARGS__) +#define otLogInfoNetData(...) otLogInfo(OT_LOG_REGION_NET_DATA, __VA_ARGS__) +#define otLogDebgNetData(...) otLogDebg(OT_LOG_REGION_NET_DATA, __VA_ARGS__) #else #define otLogCritNetData(...) #define otLogWarnNetData(...) @@ -740,11 +645,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_ICMP -#define otLogCritIcmp(...) otLogCrit(OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX, __VA_ARGS__) -#define otLogWarnIcmp(...) otLogWarn(OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX, __VA_ARGS__) -#define otLogNoteIcmp(...) otLogNote(OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX, __VA_ARGS__) -#define otLogInfoIcmp(...) otLogInfo(OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX, __VA_ARGS__) -#define otLogDebgIcmp(...) otLogDebg(OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX, __VA_ARGS__) +#define otLogCritIcmp(...) otLogCrit(OT_LOG_REGION_ICMP, __VA_ARGS__) +#define otLogWarnIcmp(...) otLogWarn(OT_LOG_REGION_ICMP, __VA_ARGS__) +#define otLogNoteIcmp(...) otLogNote(OT_LOG_REGION_ICMP, __VA_ARGS__) +#define otLogInfoIcmp(...) otLogInfo(OT_LOG_REGION_ICMP, __VA_ARGS__) +#define otLogDebgIcmp(...) otLogDebg(OT_LOG_REGION_ICMP, __VA_ARGS__) #else #define otLogCritIcmp(...) #define otLogWarnIcmp(...) @@ -798,11 +703,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_IP6 -#define otLogCritIp6(...) otLogCrit(OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX, __VA_ARGS__) -#define otLogWarnIp6(...) otLogWarn(OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX, __VA_ARGS__) -#define otLogNoteIp6(...) otLogNote(OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX, __VA_ARGS__) -#define otLogInfoIp6(...) otLogInfo(OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX, __VA_ARGS__) -#define otLogDebgIp6(...) otLogDebg(OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX, __VA_ARGS__) +#define otLogCritIp6(...) otLogCrit(OT_LOG_REGION_IP6, __VA_ARGS__) +#define otLogWarnIp6(...) otLogWarn(OT_LOG_REGION_IP6, __VA_ARGS__) +#define otLogNoteIp6(...) otLogNote(OT_LOG_REGION_IP6, __VA_ARGS__) +#define otLogInfoIp6(...) otLogInfo(OT_LOG_REGION_IP6, __VA_ARGS__) +#define otLogDebgIp6(...) otLogDebg(OT_LOG_REGION_IP6, __VA_ARGS__) #else #define otLogCritIp6(...) #define otLogWarnIp6(...) @@ -856,11 +761,11 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_TCP -#define otLogCritTcp(...) otLogCrit(OT_LOG_REGION_TCP, _OT_REGION_TCP_PREFIX, __VA_ARGS__) -#define otLogWarnTcp(...) otLogWarn(OT_LOG_REGION_TCP, _OT_REGION_TCP_PREFIX, __VA_ARGS__) -#define otLogNoteTcp(...) otLogNote(OT_LOG_REGION_TCP, _OT_REGION_TCP_PREFIX, __VA_ARGS__) -#define otLogInfoTcp(...) otLogInfo(OT_LOG_REGION_TCP, _OT_REGION_TCP_PREFIX, __VA_ARGS__) -#define otLogDebgTcp(...) otLogDebg(OT_LOG_REGION_TCP, _OT_REGION_TCP_PREFIX, __VA_ARGS__) +#define otLogCritTcp(...) otLogCrit(OT_LOG_REGION_TCP, __VA_ARGS__) +#define otLogWarnTcp(...) otLogWarn(OT_LOG_REGION_TCP, __VA_ARGS__) +#define otLogNoteTcp(...) otLogNote(OT_LOG_REGION_TCP, __VA_ARGS__) +#define otLogInfoTcp(...) otLogInfo(OT_LOG_REGION_TCP, __VA_ARGS__) +#define otLogDebgTcp(...) otLogDebg(OT_LOG_REGION_TCP, __VA_ARGS__) #else #define otLogCritTcp(...) #define otLogWarnTcp(...) @@ -925,24 +830,12 @@ void _otLogDebg(otLogRegion aRegion, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_MAC -#define otLogCritMac(...) otLogCrit(OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX, __VA_ARGS__) -#define otLogWarnMac(...) otLogWarn(OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX, __VA_ARGS__) -#define otLogNoteMac(...) otLogNote(OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX, __VA_ARGS__) -#define otLogInfoMac(...) otLogInfo(OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX, __VA_ARGS__) -#define otLogDebgMac(...) otLogDebg(OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX, __VA_ARGS__) -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogMac(aLogLevel, aFormat, ...) \ - do \ - { \ - if (otLoggingGetLevel() >= aLogLevel) \ - { \ - _otLogFormatter(aLogLevel, OT_LOG_REGION_MAC, "%s" _OT_REGION_MAC_PREFIX aFormat, \ - otLogLevelToPrefixString(aLogLevel), __VA_ARGS__); \ - } \ - } while (false) -#else +#define otLogCritMac(...) otLogCrit(OT_LOG_REGION_MAC, __VA_ARGS__) +#define otLogWarnMac(...) otLogWarn(OT_LOG_REGION_MAC, __VA_ARGS__) +#define otLogNoteMac(...) otLogNote(OT_LOG_REGION_MAC, __VA_ARGS__) +#define otLogInfoMac(...) otLogInfo(OT_LOG_REGION_MAC, __VA_ARGS__) +#define otLogDebgMac(...) otLogDebg(OT_LOG_REGION_MAC, __VA_ARGS__) void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); -#endif #else #define otLogCritMac(...) #define otLogWarnMac(...) @@ -997,11 +890,11 @@ void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_CORE -#define otLogCritCore(...) otLogCrit(OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX, __VA_ARGS__) -#define otLogWarnCore(...) otLogWarn(OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX, __VA_ARGS__) -#define otLogNoteCore(...) otLogNote(OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX, __VA_ARGS__) -#define otLogInfoCore(...) otLogInfo(OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX, __VA_ARGS__) -#define otLogDebgCore(...) otLogDebg(OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX, __VA_ARGS__) +#define otLogCritCore(...) otLogCrit(OT_LOG_REGION_CORE, __VA_ARGS__) +#define otLogWarnCore(...) otLogWarn(OT_LOG_REGION_CORE, __VA_ARGS__) +#define otLogNoteCore(...) otLogNote(OT_LOG_REGION_CORE, __VA_ARGS__) +#define otLogInfoCore(...) otLogInfo(OT_LOG_REGION_CORE, __VA_ARGS__) +#define otLogDebgCore(...) otLogDebg(OT_LOG_REGION_CORE, __VA_ARGS__) #else #define otLogCritCore(...) #define otLogWarnCore(...) @@ -1054,11 +947,11 @@ void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_MEM -#define otLogCritMem(...) otLogCrit(OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX, __VA_ARGS__) -#define otLogWarnMem(...) otLogWarn(OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX, __VA_ARGS__) -#define otLogNoteMem(...) otLogNote(OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX, __VA_ARGS__) -#define otLogInfoMem(...) otLogInfo(OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX, __VA_ARGS__) -#define otLogDebgMem(...) otLogDebg(OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX, __VA_ARGS__) +#define otLogCritMem(...) otLogCrit(OT_LOG_REGION_MEM, __VA_ARGS__) +#define otLogWarnMem(...) otLogWarn(OT_LOG_REGION_MEM, __VA_ARGS__) +#define otLogNoteMem(...) otLogNote(OT_LOG_REGION_MEM, __VA_ARGS__) +#define otLogInfoMem(...) otLogInfo(OT_LOG_REGION_MEM, __VA_ARGS__) +#define otLogDebgMem(...) otLogDebg(OT_LOG_REGION_MEM, __VA_ARGS__) #else #define otLogCritMem(...) #define otLogWarnMem(...) @@ -1112,11 +1005,11 @@ void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_UTIL -#define otLogCritUtil(...) otLogCrit(OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX, __VA_ARGS__) -#define otLogWarnUtil(...) otLogWarn(OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX, __VA_ARGS__) -#define otLogNoteUtil(...) otLogNote(OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX, __VA_ARGS__) -#define otLogInfoUtil(...) otLogInfo(OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX, __VA_ARGS__) -#define otLogDebgUtil(...) otLogDebg(OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX, __VA_ARGS__) +#define otLogCritUtil(...) otLogCrit(OT_LOG_REGION_UTIL, __VA_ARGS__) +#define otLogWarnUtil(...) otLogWarn(OT_LOG_REGION_UTIL, __VA_ARGS__) +#define otLogNoteUtil(...) otLogNote(OT_LOG_REGION_UTIL, __VA_ARGS__) +#define otLogInfoUtil(...) otLogInfo(OT_LOG_REGION_UTIL, __VA_ARGS__) +#define otLogDebgUtil(...) otLogDebg(OT_LOG_REGION_UTIL, __VA_ARGS__) #else #define otLogCritUtil(...) #define otLogWarnUtil(...) @@ -1170,11 +1063,11 @@ void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_NETDIAG -#define otLogCritNetDiag(...) otLogCrit(OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX, __VA_ARGS__) -#define otLogWarnNetDiag(...) otLogWarn(OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX, __VA_ARGS__) -#define otLogNoteNetDiag(...) otLogNote(OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX, __VA_ARGS__) -#define otLogInfoNetDiag(...) otLogInfo(OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX, __VA_ARGS__) -#define otLogDebgNetDiag(...) otLogDebg(OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX, __VA_ARGS__) +#define otLogCritNetDiag(...) otLogCrit(OT_LOG_REGION_NET_DIAG, __VA_ARGS__) +#define otLogWarnNetDiag(...) otLogWarn(OT_LOG_REGION_NET_DIAG, __VA_ARGS__) +#define otLogNoteNetDiag(...) otLogNote(OT_LOG_REGION_NET_DIAG, __VA_ARGS__) +#define otLogInfoNetDiag(...) otLogInfo(OT_LOG_REGION_NET_DIAG, __VA_ARGS__) +#define otLogDebgNetDiag(...) otLogDebg(OT_LOG_REGION_NET_DIAG, __VA_ARGS__) #else #define otLogCritNetDiag(...) #define otLogWarnNetDiag(...) @@ -1194,8 +1087,6 @@ void otLogMac(otLogLevel aLogLevel, const char *aFormat, ...); */ #if !OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE #define otLogCertMeshCoP(...) -#elif OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogCertMeshCoP(...) _otLogFormatter(OT_LOG_LEVEL_NONE, OT_LOG_REGION_MESH_COP, __VA_ARGS__) #else void otLogCertMeshCoP(const char *aFormat, ...); #endif @@ -1246,11 +1137,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); */ #if OPENTHREAD_CONFIG_LOG_CLI -#define otLogCritCli(...) otLogCrit(OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX, __VA_ARGS__) -#define otLogWarnCli(...) otLogWarn(OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX, __VA_ARGS__) -#define otLogNoteCli(...) otLogNote(OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX, __VA_ARGS__) -#define otLogInfoCli(...) otLogInfo(OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX, __VA_ARGS__) -#define otLogDebgCli(...) otLogDebg(OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX, __VA_ARGS__) +#define otLogCritCli(...) otLogCrit(OT_LOG_REGION_CLI, __VA_ARGS__) +#define otLogWarnCli(...) otLogWarn(OT_LOG_REGION_CLI, __VA_ARGS__) +#define otLogNoteCli(...) otLogNote(OT_LOG_REGION_CLI, __VA_ARGS__) +#define otLogInfoCli(...) otLogInfo(OT_LOG_REGION_CLI, __VA_ARGS__) +#define otLogDebgCli(...) otLogDebg(OT_LOG_REGION_CLI, __VA_ARGS__) #else #define otLogCritCli(...) #define otLogWarnCli(...) @@ -1304,11 +1195,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_COAP -#define otLogCritCoap(...) otLogCrit(OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX, __VA_ARGS__) -#define otLogWarnCoap(...) otLogWarn(OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX, __VA_ARGS__) -#define otLogNoteCoap(...) otLogNote(OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX, __VA_ARGS__) -#define otLogInfoCoap(...) otLogInfo(OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX, __VA_ARGS__) -#define otLogDebgCoap(...) otLogDebg(OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX, __VA_ARGS__) +#define otLogCritCoap(...) otLogCrit(OT_LOG_REGION_COAP, __VA_ARGS__) +#define otLogWarnCoap(...) otLogWarn(OT_LOG_REGION_COAP, __VA_ARGS__) +#define otLogNoteCoap(...) otLogNote(OT_LOG_REGION_COAP, __VA_ARGS__) +#define otLogInfoCoap(...) otLogInfo(OT_LOG_REGION_COAP, __VA_ARGS__) +#define otLogDebgCoap(...) otLogDebg(OT_LOG_REGION_COAP, __VA_ARGS__) #else #define otLogCritCoap(...) #define otLogWarnCoap(...) @@ -1362,11 +1253,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_DUA -#define otLogCritDua(...) otLogCrit(OT_LOG_REGION_DUA, _OT_REGION_DUA_PREFIX, __VA_ARGS__) -#define otLogWarnDua(...) otLogWarn(OT_LOG_REGION_DUA, _OT_REGION_DUA_PREFIX, __VA_ARGS__) -#define otLogNoteDua(...) otLogNote(OT_LOG_REGION_DUA, _OT_REGION_DUA_PREFIX, __VA_ARGS__) -#define otLogInfoDua(...) otLogInfo(OT_LOG_REGION_DUA, _OT_REGION_DUA_PREFIX, __VA_ARGS__) -#define otLogDebgDua(...) otLogDebg(OT_LOG_REGION_DUA, _OT_REGION_DUA_PREFIX, __VA_ARGS__) +#define otLogCritDua(...) otLogCrit(OT_LOG_REGION_DUA, __VA_ARGS__) +#define otLogWarnDua(...) otLogWarn(OT_LOG_REGION_DUA, __VA_ARGS__) +#define otLogNoteDua(...) otLogNote(OT_LOG_REGION_DUA, __VA_ARGS__) +#define otLogInfoDua(...) otLogInfo(OT_LOG_REGION_DUA, __VA_ARGS__) +#define otLogDebgDua(...) otLogDebg(OT_LOG_REGION_DUA, __VA_ARGS__) #else #define otLogCritDua(...) #define otLogWarnDua(...) @@ -1420,11 +1311,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_SRP -#define otLogCritSrp(...) otLogCrit(OT_LOG_REGION_SRP, _OT_REGION_SRP_PREFIX, __VA_ARGS__) -#define otLogWarnSrp(...) otLogWarn(OT_LOG_REGION_SRP, _OT_REGION_SRP_PREFIX, __VA_ARGS__) -#define otLogNoteSrp(...) otLogNote(OT_LOG_REGION_SRP, _OT_REGION_SRP_PREFIX, __VA_ARGS__) -#define otLogInfoSrp(...) otLogInfo(OT_LOG_REGION_SRP, _OT_REGION_SRP_PREFIX, __VA_ARGS__) -#define otLogDebgSrp(...) otLogDebg(OT_LOG_REGION_SRP, _OT_REGION_SRP_PREFIX, __VA_ARGS__) +#define otLogCritSrp(...) otLogCrit(OT_LOG_REGION_SRP, __VA_ARGS__) +#define otLogWarnSrp(...) otLogWarn(OT_LOG_REGION_SRP, __VA_ARGS__) +#define otLogNoteSrp(...) otLogNote(OT_LOG_REGION_SRP, __VA_ARGS__) +#define otLogInfoSrp(...) otLogInfo(OT_LOG_REGION_SRP, __VA_ARGS__) +#define otLogDebgSrp(...) otLogDebg(OT_LOG_REGION_SRP, __VA_ARGS__) #else #define otLogCritSrp(...) #define otLogWarnSrp(...) @@ -1478,11 +1369,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_DNS -#define otLogCritDns(...) otLogCrit(OT_LOG_REGION_DNS, _OT_REGION_DNS_PREFIX, __VA_ARGS__) -#define otLogWarnDns(...) otLogWarn(OT_LOG_REGION_DNS, _OT_REGION_DNS_PREFIX, __VA_ARGS__) -#define otLogNoteDns(...) otLogNote(OT_LOG_REGION_DNS, _OT_REGION_DNS_PREFIX, __VA_ARGS__) -#define otLogInfoDns(...) otLogInfo(OT_LOG_REGION_DNS, _OT_REGION_DNS_PREFIX, __VA_ARGS__) -#define otLogDebgDns(...) otLogDebg(OT_LOG_REGION_DNS, _OT_REGION_DNS_PREFIX, __VA_ARGS__) +#define otLogCritDns(...) otLogCrit(OT_LOG_REGION_DNS, __VA_ARGS__) +#define otLogWarnDns(...) otLogWarn(OT_LOG_REGION_DNS, __VA_ARGS__) +#define otLogNoteDns(...) otLogNote(OT_LOG_REGION_DNS, __VA_ARGS__) +#define otLogInfoDns(...) otLogInfo(OT_LOG_REGION_DNS, __VA_ARGS__) +#define otLogDebgDns(...) otLogDebg(OT_LOG_REGION_DNS, __VA_ARGS__) #else #define otLogCritDns(...) #define otLogWarnDns(...) @@ -1536,11 +1427,11 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_LOG_PLATFORM -#define otLogCritPlat(...) otLogCrit(OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX, __VA_ARGS__) -#define otLogWarnPlat(...) otLogWarn(OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX, __VA_ARGS__) -#define otLogNotePlat(...) otLogNote(OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX, __VA_ARGS__) -#define otLogInfoPlat(...) otLogInfo(OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX, __VA_ARGS__) -#define otLogDebgPlat(...) otLogDebg(OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX, __VA_ARGS__) +#define otLogCritPlat(...) otLogCrit(OT_LOG_REGION_PLATFORM, __VA_ARGS__) +#define otLogWarnPlat(...) otLogWarn(OT_LOG_REGION_PLATFORM, __VA_ARGS__) +#define otLogNotePlat(...) otLogNote(OT_LOG_REGION_PLATFORM, __VA_ARGS__) +#define otLogInfoPlat(...) otLogInfo(OT_LOG_REGION_PLATFORM, __VA_ARGS__) +#define otLogDebgPlat(...) otLogDebg(OT_LOG_REGION_PLATFORM, __VA_ARGS__) #else #define otLogCritPlat(...) #define otLogWarnPlat(...) @@ -1559,12 +1450,8 @@ void otLogCertMeshCoP(const char *aFormat, ...); * */ #if OPENTHREAD_CONFIG_OTNS_ENABLE -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define otLogOtns(...) _otLogFormatter(OT_LOG_LEVEL_NONE, OT_LOG_REGION_CORE, _OT_LEVEL_NONE_PREFIX __VA_ARGS__) -#else void otLogOtns(const char *aFormat, ...); #endif -#endif /** * @def otDumpCrit @@ -2695,57 +2582,6 @@ void otDumpMacFrame(otLogLevel aLogLevel, const char *aId, const void *aBuf, siz */ void otDump(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aId, const void *aBuf, size_t aLength); -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY || OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL -/** - * This function converts a log level to a prefix string for appending to log message. - * - * @param[in] aLogLevel A log level. - * - * @returns A C string representing the log level. - * - */ -const char *otLogLevelToPrefixString(otLogLevel aLogLevel); -#endif - -#if OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY - -/** - * Local/private macro to format the log message - */ -#define _otLogFormatter(aLogLevel, aRegion, ...) \ - _otDynamicLog(aLogLevel, aRegion, OT_FIRST_ARG(__VA_ARGS__) OPENTHREAD_CONFIG_LOG_SUFFIX OT_REST_ARGS(__VA_ARGS__)) - -#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE - -#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE -#error "Dynamic log level is not supported along with multiple OT instance feature" -#endif - -/** - * Local/private macro to dynamically filter log level. - */ -#define _otDynamicLog(aLogLevel, aRegion, ...) \ - do \ - { \ - if (otLoggingGetLevel() >= aLogLevel) \ - _otPlatLog(aLogLevel, aRegion, __VA_ARGS__); \ - } while (false) - -#else // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE - -#define _otDynamicLog(aLogLevel, aRegion, ...) _otPlatLog(aLogLevel, aRegion, __VA_ARGS__) - -#endif // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE - -/** - * `OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME` is a configuration parameter (see `config/logging.h`) which specifies the - * function/macro to be used for logging in OpenThread. By default it is set to `otPlatLog()`. - * - */ -#define _otPlatLog(aLogLevel, aRegion, ...) OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME(aLogLevel, aRegion, __VA_ARGS__) - -#endif // OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY - #define _otLogResult(aRegion, aError, ...) \ do \ { \ diff --git a/src/core/config/logging.h b/src/core/config/logging.h index 509bb73ec..d531e4a8a 100644 --- a/src/core/config/logging.h +++ b/src/core/config/logging.h @@ -390,31 +390,6 @@ #define OPENTHREAD_CONFIG_LOG_SRC_DST_IP_ADDRESSES 1 #endif -/** - * @def OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY - * - * Set to 1 to require all the logging related definition to user macro only (up to the call to the platform log API). - * Otherwise the logging implementation uses functions (which is preferred and recommended model). - * - * This is intended for special platform requirements where the logging needs to be defined a macro (e.g., for log - * tokenization or similar features). - * - */ -#ifndef OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY -#define OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY 0 -#endif - -/** - * @def OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME - * - * Defines the name of macro used for logging inside OpenThread, by default it is set to `otPlatLog()`. This is used - * and applicable only when `OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY` is set to 1. - * - */ -#ifndef OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME -#define OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME otPlatLog -#endif - /** * @def OPENTHREAD_CONFIG_LOG_MAX_SIZE * diff --git a/src/core/config/openthread-core-config-check.h b/src/core/config/openthread-core-config-check.h index 7d3e927b1..c3a78fce4 100644 --- a/src/core/config/openthread-core-config-check.h +++ b/src/core/config/openthread-core-config-check.h @@ -478,11 +478,6 @@ #error "OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL is removed, use OPENTHREAD_CONFIG_LOG_OUTPUT_APP instead" #endif -#ifdef OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION -#error "OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION was replaced by OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME " \ - "(and OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY)" -#endif - #ifdef OPENTHREAD_CONFIG_DNS_RESPONSE_TIMEOUT #error "OPENTHREAD_CONFIG_DNS_RESPONSE_TIMEOUT was replaced by OPENTHREAD_CONFIG_DNS_CLIENT_DEFAULT_RESPONSE_TIMEOUT" #endif @@ -519,4 +514,16 @@ " and OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE" #endif +#ifdef OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY +#error "OPENTHREAD_CONFIG_LOG_DEFINE_AS_MACRO_ONLY was removed and no longer supported" +#endif + +#ifdef OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME +#error "OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME was removed and no longer supported" +#endif + +#ifdef OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION +#error "OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION was removed and no longer supported" +#endif + #endif // OPENTHREAD_CORE_CONFIG_CHECK_H_