From ae7984d3a76d3c53da907bff69f27ac3505e1f58 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Tue, 29 May 2018 15:53:09 -0700
Subject: [PATCH] [logging] append log level and region prefix strings at
 compile-time (#2737)

This commit changes how the log level and region prefix strings are
appended to OpenThread's log strings. Instead of the prefix strings
being generated and added at run-time, with the change in this commit
they are appended as part of the format string of `otPlatLog()` during
compile-time.
---
 src/core/common/logging.cpp | 112 ------------
 src/core/common/logging.hpp | 336 +++++++++++++++++++++---------------
 2 files changed, 199 insertions(+), 249 deletions(-)

diff --git a/src/core/common/logging.cpp b/src/core/common/logging.cpp
index b125e6693..3f429429e 100644
--- a/src/core/common/logging.cpp
+++ b/src/core/common/logging.cpp
@@ -173,118 +173,6 @@ void otDump(otInstance *, otLogLevel, otLogRegion, const char *, const void *, c
 }
 #endif // OPENTHREAD_CONFIG_LOG_PKT_DUMP
 
-#ifdef OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL
-const char *otLogLevelToString(otLogLevel aLevel)
-{
-    const char *retval;
-
-    switch (aLevel)
-    {
-    case OT_LOG_LEVEL_NONE:
-        retval = "NONE";
-        break;
-
-    case OT_LOG_LEVEL_CRIT:
-        retval = "CRIT";
-        break;
-
-    case OT_LOG_LEVEL_WARN:
-        retval = "WARN";
-        break;
-
-    case OT_LOG_LEVEL_INFO:
-        retval = "INFO";
-        break;
-
-    case OT_LOG_LEVEL_DEBG:
-        retval = "DEBG";
-        break;
-
-    default:
-        retval = "----";
-        break;
-    }
-
-    return retval;
-}
-#endif // OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-
-#ifdef OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-const char *otLogRegionToString(otLogRegion aRegion)
-{
-    const char *retval;
-
-    switch (aRegion)
-    {
-    case OT_LOG_REGION_API:
-        retval = "-API-----";
-        break;
-
-    case OT_LOG_REGION_MLE:
-        retval = "-MLE-----";
-        break;
-
-    case OT_LOG_REGION_COAP:
-        retval = "-COAP----";
-        break;
-
-    case OT_LOG_REGION_ARP:
-        retval = "-ARP-----";
-        break;
-
-    case OT_LOG_REGION_NET_DATA:
-        retval = "-N-DATA--";
-        break;
-
-    case OT_LOG_REGION_ICMP:
-        retval = "-ICMP----";
-        break;
-
-    case OT_LOG_REGION_IP6:
-        retval = "-IP6-----";
-        break;
-
-    case OT_LOG_REGION_MAC:
-        retval = "-MAC-----";
-        break;
-
-    case OT_LOG_REGION_MEM:
-        retval = "-MEM-----";
-        break;
-
-    case OT_LOG_REGION_NCP:
-        retval = "-NCP-----";
-        break;
-
-    case OT_LOG_REGION_MESH_COP:
-        retval = "-MESH-CP-";
-        break;
-
-    case OT_LOG_REGION_NET_DIAG:
-        retval = "-DIAG----";
-        break;
-
-    case OT_LOG_REGION_PLATFORM:
-        retval = "-PLAT----";
-        break;
-
-    case OT_LOG_REGION_CORE:
-        retval = "-CORE----";
-        break;
-
-    case OT_LOG_REGION_UTIL:
-        retval = "-UTIL----";
-        break;
-
-    default:
-        retval = "---------";
-        break;
-    }
-
-    return retval;
-}
-#endif // OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-
 const char *otThreadErrorToString(otError aError)
 {
     const char *retval;
diff --git a/src/core/common/logging.hpp b/src/core/common/logging.hpp
index 85eebd83d..4ef4b0336 100644
--- a/src/core/common/logging.hpp
+++ b/src/core/common/logging.hpp
@@ -58,6 +58,66 @@
 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_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_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_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----: "
+#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_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
+#endif
+
 /**
  * @def otLogCrit
  *
@@ -71,7 +131,7 @@ extern "C" {
  */
 #if OPENTHREAD_CONFIG_LOG_LEVEL >= OT_LOG_LEVEL_CRIT
 #define otLogCrit(aInstance, aRegion, aFormat, ...) \
-    _otLogFormatter(aInstance, OT_LOG_LEVEL_CRIT, aRegion, aFormat, ##__VA_ARGS__)
+    _otLogFormatter(aInstance, OT_LOG_LEVEL_CRIT, aRegion, _OT_LEVEL_CRIT_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCrit(aInstance, aRegion, aFormat, ...)
 #endif
@@ -89,7 +149,7 @@ extern "C" {
  */
 #if OPENTHREAD_CONFIG_LOG_LEVEL >= OT_LOG_LEVEL_WARN
 #define otLogWarn(aInstance, aRegion, aFormat, ...) \
-    _otLogFormatter(aInstance, OT_LOG_LEVEL_WARN, aRegion, aFormat, ##__VA_ARGS__)
+    _otLogFormatter(aInstance, OT_LOG_LEVEL_WARN, aRegion, _OT_LEVEL_WARN_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogWarn(aInstance, aRegion, aFormat, ...)
 #endif
@@ -107,7 +167,7 @@ extern "C" {
  */
 #if OPENTHREAD_CONFIG_LOG_LEVEL >= OT_LOG_LEVEL_INFO
 #define otLogInfo(aInstance, aRegion, aFormat, ...) \
-    _otLogFormatter(aInstance, OT_LOG_LEVEL_INFO, aRegion, aFormat, ##__VA_ARGS__)
+    _otLogFormatter(aInstance, OT_LOG_LEVEL_INFO, aRegion, _OT_LEVEL_INFO_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogInfo(aInstance, aRegion, aFormat, ...)
 #endif
@@ -125,7 +185,7 @@ extern "C" {
  */
 #if OPENTHREAD_CONFIG_LOG_LEVEL >= OT_LOG_LEVEL_DEBG
 #define otLogDebg(aInstance, aRegion, aFormat, ...) \
-    _otLogFormatter(aInstance, OT_LOG_LEVEL_DEBG, aRegion, aFormat, ##__VA_ARGS__)
+    _otLogFormatter(aInstance, OT_LOG_LEVEL_DEBG, aRegion, _OT_LEVEL_DEBG_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogDebg(aInstance, aRegion, aFormat, ...)
 #endif
@@ -176,10 +236,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_API == 1
-#define otLogCritApi(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_API, aFormat, ##__VA_ARGS__)
-#define otLogWarnApi(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_API, aFormat, ##__VA_ARGS__)
-#define otLogInfoApi(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_API, aFormat, ##__VA_ARGS__)
-#define otLogDebgApi(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_API, aFormat, ##__VA_ARGS__)
+#define otLogCritApi(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_API, _OT_REGION_API_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnApi(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_API, _OT_REGION_API_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoApi(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_API, _OT_REGION_API_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgApi(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_API, _OT_REGION_API_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritApi(aInstance, aFormat, ...)
 #define otLogWarnApi(aInstance, aFormat, ...)
@@ -232,10 +296,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_MLE == 1
-#define otLogCritMeshCoP(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_MESH_COP, aFormat, ##__VA_ARGS__)
-#define otLogWarnMeshCoP(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_MESH_COP, aFormat, ##__VA_ARGS__)
-#define otLogInfoMeshCoP(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_MESH_COP, aFormat, ##__VA_ARGS__)
-#define otLogDebgMeshCoP(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_MESH_COP, aFormat, ##__VA_ARGS__)
+#define otLogCritMeshCoP(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnMeshCoP(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoMeshCoP(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgMeshCoP(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_MESH_COP, _OT_REGION_MESH_COP_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritMeshCoP(aInstance, aFormat, ...)
 #define otLogWarnMeshCoP(aInstance, aFormat, ...)
@@ -293,12 +361,17 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_MLE == 1
-#define otLogCritMle(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_MLE, aFormat, ##__VA_ARGS__)
-#define otLogWarnMle(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_MLE, aFormat, ##__VA_ARGS__)
-#define otLogWarnMleErr(aInstance, aError, aFormat, ...) \
-    otLogWarn(&aInstance, OT_LOG_REGION_MLE, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
-#define otLogInfoMle(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_MLE, aFormat, ##__VA_ARGS__)
-#define otLogDebgMle(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_MLE, aFormat, ##__VA_ARGS__)
+#define otLogCritMle(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnMle(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnMleErr(aInstance, aError, aFormat, ...)                                 \
+    otLogWarn(&aInstance, OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX "Error %s: " aFormat, \
+              otThreadErrorToString(aError), ##__VA_ARGS__)
+#define otLogInfoMle(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgMle(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_MLE, _OT_REGION_MLE_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritMle(aInstance, aFormat, ...)
 #define otLogWarnMle(aInstance, aFormat, ...)
@@ -352,10 +425,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_ARP == 1
-#define otLogCritArp(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_ARP, aFormat, ##__VA_ARGS__)
-#define otLogWarnArp(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_ARP, aFormat, ##__VA_ARGS__)
-#define otLogInfoArp(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_ARP, aFormat, ##__VA_ARGS__)
-#define otLogDebgArp(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_ARP, aFormat, ##__VA_ARGS__)
+#define otLogCritArp(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnArp(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoArp(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgArp(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_ARP, _OT_REGION_ARP_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritArp(aInstance, aFormat, ...)
 #define otLogWarnArp(aInstance, aFormat, ...)
@@ -407,10 +484,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_NETDATA == 1
-#define otLogCritNetData(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_NET_DATA, aFormat, ##__VA_ARGS__)
-#define otLogWarnNetData(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_NET_DATA, aFormat, ##__VA_ARGS__)
-#define otLogInfoNetData(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_NET_DATA, aFormat, ##__VA_ARGS__)
-#define otLogDebgNetData(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_NET_DATA, aFormat, ##__VA_ARGS__)
+#define otLogCritNetData(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnNetData(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoNetData(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgNetData(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_NET_DATA, _OT_REGION_NET_DATA_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritNetData(aInstance, aFormat, ...)
 #define otLogWarnNetData(aInstance, aFormat, ...)
@@ -462,10 +543,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_ICMP == 1
-#define otLogCritIcmp(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_ICMP, aFormat, ##__VA_ARGS__)
-#define otLogWarnIcmp(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_ICMP, aFormat, ##__VA_ARGS__)
-#define otLogInfoIcmp(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_ICMP, aFormat, ##__VA_ARGS__)
-#define otLogDebgIcmp(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_ICMP, aFormat, ##__VA_ARGS__)
+#define otLogCritIcmp(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnIcmp(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoIcmp(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgIcmp(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_ICMP, _OT_REGION_ICMP_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritIcmp(aInstance, aFormat, ...)
 #define otLogWarnIcmp(aInstance, aFormat, ...)
@@ -517,10 +602,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_IP6 == 1
-#define otLogCritIp6(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_IP6, aFormat, ##__VA_ARGS__)
-#define otLogWarnIp6(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_IP6, aFormat, ##__VA_ARGS__)
-#define otLogInfoIp6(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_IP6, aFormat, ##__VA_ARGS__)
-#define otLogDebgIp6(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_IP6, aFormat, ##__VA_ARGS__)
+#define otLogCritIp6(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnIp6(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoIp6(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgIp6(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_IP6, _OT_REGION_IP6_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritIp6(aInstance, aFormat, ...)
 #define otLogWarnIp6(aInstance, aFormat, ...)
@@ -573,12 +662,17 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_MAC == 1
-#define otLogCritMac(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_MAC, aFormat, ##__VA_ARGS__)
-#define otLogWarnMac(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_MAC, aFormat, ##__VA_ARGS__)
-#define otLogInfoMac(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_MAC, aFormat, ##__VA_ARGS__)
-#define otLogDebgMac(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_MAC, aFormat, ##__VA_ARGS__)
-#define otLogDebgMacErr(aInstance, aError, aFormat, ...) \
-    otLogWarn(aInstance, OT_LOG_REGION_MAC, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
+#define otLogCritMac(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnMac(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoMac(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgMac(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgMacErr(aInstance, aError, aFormat, ...)                                                               \
+    otLogWarn(aInstance, OT_LOG_REGION_MAC, _OT_REGION_MAC_PREFIX "Error %s: " aFormat, otThreadErrorToString(aError), \
+              ##__VA_ARGS__)
 #else
 #define otLogCritMac(aInstance, aFormat, ...)
 #define otLogWarnMac(aInstance, aFormat, ...)
@@ -631,12 +725,17 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_CORE == 1
-#define otLogCritCore(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_CORE, aFormat, ##__VA_ARGS__)
-#define otLogWarnCore(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_CORE, aFormat, ##__VA_ARGS__)
-#define otLogInfoCore(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_CORE, aFormat, ##__VA_ARGS__)
-#define otLogDebgCore(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_CORE, aFormat, ##__VA_ARGS__)
-#define otLogDebgCoreErr(aInstance, aError, aFormat, ...) \
-    otLogWarn(aInstance, OT_LOG_REGION_CORE, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
+#define otLogCritCore(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnCore(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoCore(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgCore(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgCoreErr(aInstance, aError, aFormat, ...)                                 \
+    otLogWarn(aInstance, OT_LOG_REGION_CORE, _OT_REGION_CORE_PREFIX "Error %s: " aFormat, \
+              otThreadErrorToString(aError), ##__VA_ARGS__)
 #else
 #define otLogCritCore(aInstance, aFormat, ...)
 #define otLogWarnCore(aInstance, aFormat, ...)
@@ -691,10 +790,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_MEM == 1
-#define otLogCritMem(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_MEM, aFormat, ##__VA_ARGS__)
-#define otLogWarnMem(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_MEM, aFormat, ##__VA_ARGS__)
-#define otLogInfoMem(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_MEM, aFormat, ##__VA_ARGS__)
-#define otLogDebgMem(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_MEM, aFormat, ##__VA_ARGS__)
+#define otLogCritMem(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnMem(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoMem(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgMem(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_MEM, _OT_REGION_MEM_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritMem(aInstance, aFormat, ...)
 #define otLogWarnMem(aInstance, aFormat, ...)
@@ -746,12 +849,17 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_UTIL == 1
-#define otLogCritUtil(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_UTIL, aFormat, ##__VA_ARGS__)
-#define otLogWarnUtil(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_UTIL, aFormat, ##__VA_ARGS__)
-#define otLogInfoUtil(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_UTIL, aFormat, ##__VA_ARGS__)
-#define otLogInfoUtilErr(aInstance, aError, aFormat, ...) \
-    otLogInfo(&aInstance, OT_LOG_REGION_UTIL, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
-#define otLogDebgUtil(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_UTIL, aFormat, ##__VA_ARGS__)
+#define otLogCritUtil(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnUtil(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoUtil(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoUtilErr(aInstance, aError, aFormat, ...)                                  \
+    otLogInfo(&aInstance, OT_LOG_REGION_UTIL, _OT_REGION_CORE_PREFIX "Error %s: " aFormat, \
+              otThreadErrorToString(aError), ##__VA_ARGS__)
+#define otLogDebgUtil(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_UTIL, _OT_REGION_UTIL_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritUtil(aInstance, aFormat, ...)
 #define otLogWarnUtil(aInstance, aFormat, ...)
@@ -804,10 +912,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_NETDIAG == 1
-#define otLogCritNetDiag(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_NET_DIAG, aFormat, ##__VA_ARGS__)
-#define otLogWarnNetDiag(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_NET_DIAG, aFormat, ##__VA_ARGS__)
-#define otLogInfoNetDiag(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_NET_DIAG, aFormat, ##__VA_ARGS__)
-#define otLogDebgNetDiag(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_NET_DIAG, aFormat, ##__VA_ARGS__)
+#define otLogCritNetDiag(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnNetDiag(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoNetDiag(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgNetDiag(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_NET_DIAG, _OT_REGION_NET_DIAG_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritNetDiag(aInstance, aFormat, ...)
 #define otLogWarnNetDiag(aInstance, aFormat, ...)
@@ -877,12 +989,16 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_CLI == 1
-#define otLogCritCli(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_CLI, aFormat, ##__VA_ARGS__)
-#define otLogWarnCli(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_CLI, aFormat, ##__VA_ARGS__)
-#define otLogInfoCli(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_CLI, aFormat, ##__VA_ARGS__)
+#define otLogCritCli(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnCli(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoCli(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX aFormat, ##__VA_ARGS__)
 #define otLogInfoCliErr(aInstance, aError, aFormat, ...) \
     otLogInfo(&aInstance, OT_LOG_REGION_CLI, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
-#define otLogDebgCli(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_CLI, aFormat, ##__VA_ARGS__)
+#define otLogDebgCli(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_CLI, _OT_REGION_CLI_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritCli(aInstance, aFormat, ...)
 #define otLogWarnCli(aInstance, aFormat, ...)
@@ -935,12 +1051,17 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_COAP == 1
-#define otLogCritCoap(aInstance, aFormat, ...) otLogCrit(&aInstance, OT_LOG_REGION_COAP, aFormat, ##__VA_ARGS__)
-#define otLogWarnCoap(aInstance, aFormat, ...) otLogWarn(&aInstance, OT_LOG_REGION_COAP, aFormat, ##__VA_ARGS__)
-#define otLogInfoCoap(aInstance, aFormat, ...) otLogInfo(&aInstance, OT_LOG_REGION_COAP, aFormat, ##__VA_ARGS__)
-#define otLogInfoCoapErr(aInstance, aError, aFormat, ...) \
-    otLogInfo(&aInstance, OT_LOG_REGION_COAP, "Error %s: " aFormat, otThreadErrorToString(aError), ##__VA_ARGS__)
-#define otLogDebgCoap(aInstance, aFormat, ...) otLogDebg(&aInstance, OT_LOG_REGION_COAP, aFormat, ##__VA_ARGS__)
+#define otLogCritCoap(aInstance, aFormat, ...) \
+    otLogCrit(&aInstance, OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnCoap(aInstance, aFormat, ...) \
+    otLogWarn(&aInstance, OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoCoap(aInstance, aFormat, ...) \
+    otLogInfo(&aInstance, OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoCoapErr(aInstance, aError, aFormat, ...)                                  \
+    otLogInfo(&aInstance, OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX "Error %s: " aFormat, \
+              otThreadErrorToString(aError), ##__VA_ARGS__)
+#define otLogDebgCoap(aInstance, aFormat, ...) \
+    otLogDebg(&aInstance, OT_LOG_REGION_COAP, _OT_REGION_COAP_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritCoap(aInstance, aFormat, ...)
 #define otLogWarnCoap(aInstance, aFormat, ...)
@@ -993,10 +1114,14 @@ extern "C" {
  *
  */
 #if OPENTHREAD_CONFIG_LOG_PLATFORM == 1
-#define otLogCritPlat(aInstance, aFormat, ...) otLogCrit(aInstance, OT_LOG_REGION_PLATFORM, aFormat, ##__VA_ARGS__)
-#define otLogWarnPlat(aInstance, aFormat, ...) otLogWarn(aInstance, OT_LOG_REGION_PLATFORM, aFormat, ##__VA_ARGS__)
-#define otLogInfoPlat(aInstance, aFormat, ...) otLogInfo(aInstance, OT_LOG_REGION_PLATFORM, aFormat, ##__VA_ARGS__)
-#define otLogDebgPlat(aInstance, aFormat, ...) otLogDebg(aInstance, OT_LOG_REGION_PLATFORM, aFormat, ##__VA_ARGS__)
+#define otLogCritPlat(aInstance, aFormat, ...) \
+    otLogCrit(aInstance, OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogWarnPlat(aInstance, aFormat, ...) \
+    otLogWarn(aInstance, OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogInfoPlat(aInstance, aFormat, ...) \
+    otLogInfo(aInstance, OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX aFormat, ##__VA_ARGS__)
+#define otLogDebgPlat(aInstance, aFormat, ...) \
+    otLogDebg(aInstance, OT_LOG_REGION_PLATFORM, _OT_REGION_PLATFORM_PREFIX aFormat, ##__VA_ARGS__)
 #else
 #define otLogCritPlat(aInstance, aFormat, ...)
 #define otLogWarnPlat(aInstance, aFormat, ...)
@@ -1591,75 +1716,12 @@ void otDump(otInstance * aIntsance,
             const void * aBuf,
             const size_t aLength);
 
-#if OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL == 1
-/**
- * This method converts the log level value into a string
- *
- * @param[in]  aLevel  The log level.
- *
- * @returns A const char pointer to the C string corresponding to the log level.
- *
- */
-const char *otLogLevelToString(otLogLevel aLevel);
-#endif
-
-#if OPENTHREAD_CONFIG_LOG_PREPEND_REGION == 1
-/**
- * This method converts the log region value into a string
- *
- * @param[in]  aRegion  The log region.
- *
- * @returns A const char pointer to the C string corresponding to the log region.
- *
- */
-const char *otLogRegionToString(otLogRegion aRegion);
-#endif
-
-#if OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL == 1
-
-#if OPENTHREAD_CONFIG_LOG_PREPEND_REGION == 1
-
-/**
- * Local/private macro to format the log message
- */
-#define _otLogFormatter(aInstance, aLogLevel, aRegion, aFormat, ...)                              \
-    _otDynamicLog(aInstance, aLogLevel, aRegion, "[%s]%s: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
-                  otLogLevelToString(aLogLevel), otLogRegionToString(aRegion), ##__VA_ARGS__)
-
-#else // OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-
-/**
- * Local/private macro to format the log message
- */
-#define _otLogFormatter(aInstanc, aLogLevel, aRegion, aFormat, ...)                             \
-    _otDynamicLog(aInstance, aLogLevel, aRegion, "[%s]: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
-                  otLogLevelToString(aLogLevel), ##__VA_ARGS__)
-
-#endif
-
-#else // OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL
-
-#if OPENTHREAD_CONFIG_LOG_PREPEND_REGION == 1
-
-/**
- * Local/private macro to format the log message
- */
-#define _otLogFormatter(aInstance, aLogLevel, aRegion, aFormat, ...)                          \
-    _otDynamicLog(aInstance, aLogLevel, aRegion, "%s: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
-                  otLogRegionToString(aRegion), ##__VA_ARGS__)
-
-#else // OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-
 /**
  * Local/private macro to format the log message
  */
 #define _otLogFormatter(aInstance, aLogLevel, aRegion, aFormat, ...) \
     _otDynamicLog(aInstance, aLogLevel, aRegion, aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, ##__VA_ARGS__)
 
-#endif
-
-#endif // OPENTHREAD_CONFIG_LOG_PREPEND_REGION
-
 #if OPENTHREAD_CONFIG_ENABLE_DYNAMIC_LOG_LEVEL == 1
 
 /**