patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

logging: add support for 64 bit timestamps with Linux format

Browse source 
Combining CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP and
CONFIG_LOG_TIMESTAMP_64BIT results in a wrong timestamp, as the
Linux timestamp format print call assumes a 32 bit variable for
the seconds. Fix it by using a different print format for 64 bit
timestamps.

Fixes: #55372

Signed-off-by: Martin Sollie <ms@aziwell.no>
This commit is contained in:
Martin Sollie 2023-03-02 18:03:20 +01:00 committed by Carles Cufí
parent 70c6befa88
commit e94c33d530
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subsys/logging/log_output.c
View file

@ -276,7 +276,11 @@ static int timestamp_print(const struct log_output *output,
} else {
if (IS_ENABLED(CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP)) {
length = print_formatted(output,
"[%5ld.%06d] ",
#if defined(CONFIG_LOG_TIMESTAMP_64BIT)
"[%5llu.%06d] ",
#else
"[%5lu.%06d] ",
#endif
total_seconds, ms * 1000U + us);
} else {
length = print_formatted(output,