michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: logging: Add CR/LF handling flags

Browse source 
Add 2 new flags to control the output of newlines by the logger output
module. By default the logger adds both CR and LF, and with these 2 new
flags it is now possible to request LF only or no newlines at all.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2018-10-18 17:36:36 +02:00 • committed by Anas Nashif
commit 322647129f
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/logging/log_output.h
View file

@ -33,6 +33,12 @@ extern "C" {
/** @brief Flag forcing severity level prefix. */ /** @brief Flag forcing severity level prefix. */
#define LOG_OUTPUT_FLAG_LEVEL BIT(3) #define LOG_OUTPUT_FLAG_LEVEL BIT(3)
/** @brief Flag preventing the logger from adding CR and LF characters. */
#define LOG_OUTPUT_FLAG_CRLF_NONE BIT(4)
/** @brief Flag forcing a single LF character for line breaks. */
#define LOG_OUTPUT_FLAG_CRLF_LFONLY BIT(5)
/** /**
* @brief Prototype of the function processing output data. * @brief Prototype of the function processing output data.
* *

25
subsys/logging/log_output.c
View file

@ -183,9 +183,18 @@ static int ids_print(struct log_msg *msg,
return total; return total;
} }
static void newline_print(const struct log_output *ctx) static void newline_print(const struct log_output *ctx, u32_t flags)
{ {
print_formatted(ctx, "\r\n");
if (flags & LOG_OUTPUT_FLAG_CRLF_NONE) {
return;
}
if (flags & LOG_OUTPUT_FLAG_CRLF_LFONLY) {
print_formatted(ctx, "\n");
} else {
print_formatted(ctx, "\r\n");
}
} }
static void std_print(struct log_msg *msg, static void std_print(struct log_msg *msg,
@ -277,7 +286,7 @@ static void std_print(struct log_msg *msg,
static u32_t hexdump_line_print(struct log_msg *msg, static u32_t hexdump_line_print(struct log_msg *msg,
const struct log_output *log_output, const struct log_output *log_output,
int prefix_offset, int prefix_offset,
u32_t offset) u32_t offset, u32_t flags)
{ {
u8_t buf[HEXDUMP_BYTES_IN_LINE]; u8_t buf[HEXDUMP_BYTES_IN_LINE];
size_t length = sizeof(buf); size_t length = sizeof(buf);
@ -285,7 +294,7 @@ static u32_t hexdump_line_print(struct log_msg *msg,
log_msg_hexdump_data_get(msg, buf, &length, offset); log_msg_hexdump_data_get(msg, buf, &length, offset);
if (length > 0) { if (length > 0) {
newline_print(log_output); newline_print(log_output, flags);
for (int i = 0; i < prefix_offset; i++) { for (int i = 0; i < prefix_offset; i++) {
print_formatted(log_output, " "); print_formatted(log_output, " ");
@ -318,7 +327,7 @@ static u32_t hexdump_line_print(struct log_msg *msg,
static void hexdump_print(struct log_msg *msg, static void hexdump_print(struct log_msg *msg,
const struct log_output *log_output, const struct log_output *log_output,
int prefix_offset) int prefix_offset, u32_t flags)
{ {
u32_t offset = 0; u32_t offset = 0;
u32_t length; u32_t length;
@ -327,7 +336,7 @@ static void hexdump_print(struct log_msg *msg,
do { do {
length = hexdump_line_print(msg, log_output, prefix_offset, length = hexdump_line_print(msg, log_output, prefix_offset,
offset); offset, flags);
if (length < HEXDUMP_BYTES_IN_LINE) { if (length < HEXDUMP_BYTES_IN_LINE) {
break; break;
@ -390,7 +399,7 @@ static void postfix_print(struct log_msg *msg,
if (!log_msg_is_raw_string(msg)) { if (!log_msg_is_raw_string(msg)) {
color_postfix(msg, log_output, color_postfix(msg, log_output,
(flags & LOG_OUTPUT_FLAG_COLORS)); (flags & LOG_OUTPUT_FLAG_COLORS));
newline_print(log_output); newline_print(log_output, flags);
} }
} }
@ -405,7 +414,7 @@ void log_output_msg_process(const struct log_output *log_output,
} else if (log_msg_is_raw_string(msg)) { } else if (log_msg_is_raw_string(msg)) {
raw_string_print(msg, log_output); raw_string_print(msg, log_output);
} else { } else {
hexdump_print(msg, log_output, prefix_offset); hexdump_print(msg, log_output, prefix_offset, flags);
} }
postfix_print(msg, log_output, flags); postfix_print(msg, log_output, flags);