logblame: add support for default format logcat
Parse default format: 06-19 17:12:50.395 2260 2260 D PackageManager: blah blah Signed-off-by: Mark Salyzyn <salyzyn@google.com> Test: Feed logcat -b all -d output to analyze_logs.py Bug: 62836752 Change-Id: I64140b230558bdfddff0dc1560268b5516b8e04d
This commit is contained in:
@@ -5,6 +5,7 @@ import re
|
||||
BUFFER_BEGIN = re.compile("^--------- beginning of (.*)$")
|
||||
BUFFER_SWITCH = re.compile("^--------- switch to (.*)$")
|
||||
HEADER = re.compile("^\\[ (\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d.\\d\\d\\d) +(.+?): *(\\d+): *(\\d+) *([EWIDV])/(.*?) *\\]$")
|
||||
HEADER_TYPE2 = re.compile("^(\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d.\\d\\d\\d) *(\\d+) *(\\d+) *([EWIDV]) ([^ :]*?): (.*?)$")
|
||||
CHATTY_IDENTICAL = re.compile("^.* identical (\\d+) lines$")
|
||||
|
||||
STATE_BEGIN = 0
|
||||
@@ -135,6 +136,25 @@ def ParseLogcatInner(f, processes, duration=None):
|
||||
state = STATE_HEADER
|
||||
continue
|
||||
|
||||
m = HEADER_TYPE2.match(line)
|
||||
if m:
|
||||
if logLine:
|
||||
yield logLine
|
||||
logLine = LogLine(
|
||||
buf=buf,
|
||||
timestamp=m.group(1),
|
||||
uid="0",
|
||||
pid=m.group(2),
|
||||
tid=m.group(3),
|
||||
level=m.group(4),
|
||||
tag=m.group(5),
|
||||
text=m.group(6)
|
||||
)
|
||||
previous = logLine
|
||||
logLine.process = processes.FindPid(logLine.pid, logLine.uid)
|
||||
state = STATE_BEGIN
|
||||
continue
|
||||
|
||||
if not len(line):
|
||||
if state == STATE_BLANK:
|
||||
if logLine:
|
||||
|
||||
Reference in New Issue
Block a user