bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logging: Add option to suppress timestamp printing in log_output

Browse Source 
Added flag in log_output module to add timestamp when message is
formatted to a string. Updated existing backends.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-09-26 14:18:55 +02:00 committed by Carles Cufí
parent 07da32aae5
commit 2cc6d0c9c2
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/logging/log_output.h
View File

@ -22,13 +22,16 @@ extern "C" {
/** @brief Flag forcing ANSI escape code colors, red (errors), yellow
* (warnings).
*/
#define LOG_OUTPUT_FLAG_COLORS (1 << 0)
#define LOG_OUTPUT_FLAG_COLORS BIT(0)
/** @brief Flag forcing timestamp */
#define LOG_OUTPUT_FLAG_TIMESTAMP BIT(1)
/** @brief Flag forcing timestamp formatting. */
#define LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP (1 << 1)
#define LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP BIT(2)
/** @brief Flag forcing severity level prefix. */
#define LOG_OUTPUT_FLAG_LEVEL (1 << 2)
#define LOG_OUTPUT_FLAG_LEVEL BIT(3)
/**
* @brief Prototype of the function processing output data.

2
subsys/logging/log_backend_native_posix.c
View File

@ -61,7 +61,7 @@ static void put(const struct log_backend *const backend,
{
log_msg_get(msg);
u32_t flags = LOG_OUTPUT_FLAG_LEVEL;
u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
if (posix_trace_over_tty(0)) {

2
subsys/logging/log_backend_uart.c
View File

@ -32,7 +32,7 @@ static void put(const struct log_backend *const backend,
{
log_msg_get(msg);
u32_t flags = LOG_OUTPUT_FLAG_LEVEL;
u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
flags |= LOG_OUTPUT_FLAG_COLORS;

11
subsys/logging/log_output.c
View File

@ -364,11 +364,18 @@ static int prefix_print(struct log_msg *msg,
int length = 0;
if (!log_msg_is_raw_string(msg)) {
bool stamp_format = flags & LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
bool stamp = flags & LOG_OUTPUT_FLAG_TIMESTAMP;
bool colors_on = flags & LOG_OUTPUT_FLAG_COLORS;
bool level_on = flags & LOG_OUTPUT_FLAG_LEVEL;
length += timestamp_print(msg, log_output, stamp_format);
if (stamp) {
bool stamp_format =
flags & LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
length += timestamp_print(msg, log_output,
stamp_format);
}
color_prefix(msg, log_output, colors_on);
length += ids_print(msg, log_output, level_on);
}

4
subsys/shell/shell_log_backend.c
View File

@ -74,7 +74,9 @@ void shell_log_backend_disable(const struct shell_log_backend *backend)
static void msg_process(const struct log_output *log_output,
struct log_msg *msg)
{
u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
u32_t flags = LOG_OUTPUT_FLAG_LEVEL |
LOG_OUTPUT_FLAG_TIMESTAMP |
LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
if (IS_ENABLED(CONFIG_SHELL_VT100_COLORS)) {
flags |= LOG_OUTPUT_FLAG_COLORS;