166fd0dc9e
A previous commit fixed OpenThread logging when `LOG=n`, but introduced regression when `LOG_MODE_MINIMAL=y`. This commit fixes the latest. Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>
92 lines
1.8 KiB
C
92 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2018 - 2020 Nordic Semiconductor ASA
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <kernel.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#include <openthread/platform/logging.h>
|
|
#include "openthread-core-zephyr-config.h"
|
|
|
|
#define LOG_MODULE_NAME net_openthread
|
|
#define LOG_LEVEL LOG_LEVEL_DBG
|
|
#include <logging/log.h>
|
|
LOG_MODULE_REGISTER(LOG_MODULE_NAME);
|
|
|
|
#include "platform-zephyr.h"
|
|
|
|
/* Convert OT log level to zephyr log level. */
|
|
static inline int log_translate(otLogLevel aLogLevel)
|
|
{
|
|
switch (aLogLevel) {
|
|
case OT_LOG_LEVEL_NONE:
|
|
case OT_LOG_LEVEL_CRIT:
|
|
return LOG_LEVEL_ERR;
|
|
case OT_LOG_LEVEL_WARN:
|
|
return LOG_LEVEL_WRN;
|
|
case OT_LOG_LEVEL_NOTE:
|
|
case OT_LOG_LEVEL_INFO:
|
|
return LOG_LEVEL_INF;
|
|
case OT_LOG_LEVEL_DEBG:
|
|
return LOG_LEVEL_DBG;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
#if defined(CONFIG_LOG)
|
|
static uint32_t count_args(const char *fmt)
|
|
{
|
|
uint32_t args = 0U;
|
|
bool prev = false; /* if previous char was a modificator. */
|
|
|
|
while (*fmt != '\0') {
|
|
if (*fmt == '%') {
|
|
prev = !prev;
|
|
} else if (prev) {
|
|
args++;
|
|
prev = false;
|
|
} else {
|
|
; /* standard character, continue walk */
|
|
}
|
|
fmt++;
|
|
}
|
|
|
|
return args;
|
|
}
|
|
#endif
|
|
|
|
void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...)
|
|
{
|
|
ARG_UNUSED(aLogRegion);
|
|
|
|
#if defined(CONFIG_LOG)
|
|
int level = log_translate(aLogLevel);
|
|
uint32_t args_num = count_args(aFormat);
|
|
va_list param_list;
|
|
|
|
if (level < 0) {
|
|
return;
|
|
}
|
|
|
|
va_start(param_list, aFormat);
|
|
|
|
/* We assume, that OT has no access to strdup utility,
|
|
* and we are not obliged to check, if string has already
|
|
* been duplicated. So, to save time, in Z_LOG_VA macro calls
|
|
* we will use LOG_STRDUP_EXEC option.
|
|
*/
|
|
Z_LOG_VA(level, aFormat, param_list, args_num, LOG_STRDUP_EXEC);
|
|
va_end(param_list);
|
|
#else
|
|
ARG_UNUSED(aLogLevel);
|
|
ARG_UNUSED(aFormat);
|
|
#endif
|
|
|
|
}
|