commit 6d1633e1316adbf526d93d2815840554c803f7b4
author Mark Salyzyn <salyzyn@google.com> Thu Jul 13 11:33:12 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Jul 13 12:25:17 2017 -0700
tree ba4c017326619991c311eb1f69bb7347af1f59ce
parent e48479fc30b47cf677ad57d27fc49002ba77991d

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

tools/logblame/logs.py

diff --git a/tools/logblame/logs.py b/tools/logblame/logs.py
index 400a39b..6982e06 100644
--- a/tools/logblame/logs.py
+++ b/tools/logblame/logs.py
@@ -5,6 +5,7 @@
 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 @@
       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: