diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-12-23 14:48:31 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-01-05 16:14:27 +1100 |
commit | 197f3caf7c1ea192b8d02319e9dfc8cfc2171635 (patch) | |
tree | 52d14f429a8b76849dd49f5ab0106ca50c7bd41b /external | |
parent | 582a754d8a1525842155326948ce8da31cdbee37 (diff) | |
download | skiboot-197f3caf7c1ea192b8d02319e9dfc8cfc2171635.zip skiboot-197f3caf7c1ea192b8d02319e9dfc8cfc2171635.tar.gz skiboot-197f3caf7c1ea192b8d02319e9dfc8cfc2171635.tar.bz2 |
generate-fwts-olog: add support for parsing prerror()
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'external')
-rwxr-xr-x | external/fwts/generate-fwts-olog | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/external/fwts/generate-fwts-olog b/external/fwts/generate-fwts-olog index 02a9a50..d108823 100755 --- a/external/fwts/generate-fwts-olog +++ b/external/fwts/generate-fwts-olog @@ -41,10 +41,10 @@ def create_parser(): re.DOTALL) # Match the following prlog() call - log_call = (Literal("prlog") + - Literal('(').suppress() + - Word(string.letters + string.digits + '_') + - Literal(',').suppress() + + log_call = (((Literal("prerror") + Literal('(').suppress()) | + (Literal("prlog") + Literal('(').suppress() + + Word(string.letters + string.digits + '_') + + Literal(',').suppress())) + Combine(OneOrMore(QuotedString('"')), adjacent=False) + (Literal(')') | Literal(',')).suppress() ) @@ -167,11 +167,15 @@ def parse_patterns(parser, fname, tag): i = 1 for result in parser.scanString(data): (token, loc, _) = result - (annotations, logfn, level, msg) = token + if token[1] == 'prlog': + (annotations, logfn, level, msg) = token + else: + (annotations, logfn, msg) = token + level = 'PR_ERR' loc = (fname, lineno(loc, data)) - if logfn != 'prlog': + if logfn != 'prlog' and logfn != 'prerror': warn(loc, "unknown log output function '%s'" % logfn) compare_mode, pattern_str = message_to_pattern(loc, msg) |