leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log: Update log_console to honour the log format

Browse Source 
At present this just outputs the message. Update it to output whatever the
format requests.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-12-28 13:14:18 -07:00
parent 3b73e8d067
commit deca50fbd5
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/log_console.c
View File

@ -10,9 +10,34 @@
#include <common.h>
#include <log.h>
DECLARE_GLOBAL_DATA_PTR;
static int log_console_emit(struct log_device *ldev, struct log_rec *rec)
{
puts(rec->msg);
int fmt = gd->log_fmt;
/*
* The output format is designed to give someone a fighting chance of
* figuring out which field is which:
* - level is in CAPS
* - cat is lower case and ends with comma
* - file normally has a .c extension and ends with a colon
* - line is integer and ends with a -
* - function is an identifier and ends with ()
* - message has a space before it unless it is on its own
*/
if (fmt & (1 << LOGF_LEVEL))
printf("%s.", log_get_level_name(rec->level));
if (fmt & (1 << LOGF_CAT))
printf("%s,", log_get_cat_name(rec->cat));
if (fmt & (1 << LOGF_FILE))
printf("%s:", rec->file);
if (fmt & (1 << LOGF_LINE))
printf("%d-", rec->line);
if (fmt & (1 << LOGF_FUNC))
printf("%s()", rec->func);
if (fmt & (1 << LOGF_MSG))
printf("%s%s", fmt != (1 << LOGF_MSG) ? " " : "", rec->msg);
return 0;
}

4
test/py/tests/test_log.py
View File

@ -28,9 +28,9 @@ def test_log(u_boot_console):
"""
for i in range(max_level):
if mask & 1:
assert 'log %d' % i == lines.next()
assert 'log_run() log %d' % i == lines.next()
if mask & 3:
assert '_log %d' % i == lines.next()
assert 'func() _log %d' % i == lines.next()
def run_test(testnum):
"""Run a particular test number (the 'log test' command)