Merge "Fix logcat parsing in bugreports."

2 files changed, 83 insertions, 5 deletions

diff --git a/src/com/android/loganalysis/parser/LogcatParser.java b/src/com/android/loganalysis/parser/LogcatParser.java
index 96cd1c2..b32536d 100644
--- a/src/com/android/loganalysis/parser/LogcatParser.java
+++ b/src/com/android/loganalysis/parser/LogcatParser.java
@@ -54,12 +54,18 @@ public class LogcatParser implements IParser {
 
     /**
      * Match a single line of `logcat -v threadtime`, such as:
-     * 05-26 11:02:36.886  5689  5689 D AndroidRuntime: CheckJNI is OFF
+     *
+     * <pre>05-26 11:02:36.886 5689 5689 D AndroidRuntime: CheckJNI is OFF.</pre>
      */
-    private static final Pattern THREADTIME_LINE = Pattern.compile(
-            "^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})\\s+" +  /* timestamp [1] */
-                "(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+" +  /* pid/tid and log level [2-4] */
-                "(.+?)\\s*: (.*)$" /* tag and message [5-6]*/);
+    private static final Pattern THREADTIME_LINE =
+            // UID was added to logcat. It could either be a number or a string.
+            Pattern.compile(
+                    // timestamp[1]
+                    "^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})"
+                            // pid/tid and log level [2-4]
+                            + "(?:\\s+[0-9A-Za-z]+)?\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+"
+                            // tag and message [5-6]
+                            + "(.+?)\\s*: (.*)$");
 
     /**
      * Match a single line of `logcat -v time`, such as:
diff --git a/tests/src/com/android/loganalysis/parser/LogcatParserTest.java b/tests/src/com/android/loganalysis/parser/LogcatParserTest.java
index 7adeed6..1d4f72c 100644
--- a/tests/src/com/android/loganalysis/parser/LogcatParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/LogcatParserTest.java
@@ -442,6 +442,78 @@ public class LogcatParserTest extends TestCase {
 
         assertEquals(3064, logcat.getJavaCrashes().get(0).getPid().intValue());
         assertEquals(3082, logcat.getJavaCrashes().get(0).getTid().intValue());
+        assertEquals(
+                parseTime("2012-04-25 09:55:47.799"),
+                logcat.getJavaCrashes().get(0).getEventTime());
+
+        assertEquals(3065, logcat.getJavaCrashes().get(1).getPid().intValue());
+        assertEquals(3090, logcat.getJavaCrashes().get(1).getTid().intValue());
+        assertEquals(
+                parseTime("2012-04-25 09:55:47.799"),
+                logcat.getJavaCrashes().get(1).getEventTime());
+
+        assertEquals(3112, logcat.getNativeCrashes().get(0).getPid().intValue());
+        assertEquals(3112, logcat.getNativeCrashes().get(0).getTid().intValue());
+        assertEquals(
+                parseTime("2012-04-25 18:33:27.273"),
+                logcat.getNativeCrashes().get(0).getEventTime());
+
+        assertEquals(3113, logcat.getNativeCrashes().get(1).getPid().intValue());
+        assertEquals(3113, logcat.getNativeCrashes().get(1).getTid().intValue());
+        assertEquals(
+                parseTime("2012-04-25 18:33:27.273"),
+                logcat.getNativeCrashes().get(1).getEventTime());
+    }
+
+    /** Test that including extra uid column still parses the logs. */
+    public void testParse_uid() throws ParseException {
+        List<String> lines =
+                Arrays.asList(
+                        "04-25 09:55:47.799  wifi  3064  3082 E AndroidRuntime: java.lang.Exception",
+                        "04-25 09:55:47.799  wifi  3064  3082 E AndroidRuntime: \tat class.method1(Class.java:1)",
+                        "04-25 09:55:47.799  wifi  3064  3082 E AndroidRuntime: \tat class.method2(Class.java:2)",
+                        "04-25 09:55:47.799  wifi  3064  3082 E AndroidRuntime: \tat class.method3(Class.java:3)",
+                        "04-25 09:55:47.799  wifi  3065  3090 E AndroidRuntime: java.lang.Exception",
+                        "04-25 09:55:47.799  wifi  3065  3090 E AndroidRuntime: \tat class.method1(Class.java:1)",
+                        "04-25 09:55:47.799  wifi  3065  3090 E AndroidRuntime: \tat class.method2(Class.java:2)",
+                        "04-25 09:55:47.799  wifi  3065  3090 E AndroidRuntime: \tat class.method3(Class.java:3)",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: ANR (application not responding) in process: com.android.package",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: Reason: keyDispatchingTimedOut",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: Load: 0.71 / 0.83 / 0.51",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: 33% TOTAL: 21% user + 11% kernel + 0.3% iowait",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: ANR (application not responding) in process: com.android.package",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: Reason: keyDispatchingTimedOut",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: Load: 0.71 / 0.83 / 0.51",
+                        "04-25 17:17:08.445  1337  312   366 E ActivityManager: 33% TOTAL: 21% user + 11% kernel + 0.3% iowait",
+                        "04-25 18:33:27.273  wifi123  115   115 I DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***",
+                        "04-25 18:33:27.273  wifi123  115   115 I DEBUG   : Build fingerprint: 'product:build:target'",
+                        "04-25 18:33:27.273  wifi123  115   115 I DEBUG   : pid: 3112, tid: 3112  >>> com.google.android.browser <<<",
+                        "04-25 18:33:27.273  wifi123  115   115 I DEBUG   : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 00000000",
+                        "04-25 18:33:27.273  wifi123  117   117 I DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***",
+                        "04-25 18:33:27.273  wifi123  117   117 I DEBUG   : Build fingerprint: 'product:build:target'",
+                        "04-25 18:33:27.273  wifi123  117   117 I DEBUG   : pid: 3113, tid: 3113  >>> com.google.android.browser <<<",
+                        "04-25 18:33:27.273  wifi123  117   117 I DEBUG   : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 00000000");
+
+
+        LogcatItem logcat = new LogcatParser("2012").parse(lines);
+        assertNotNull(logcat);
+        assertEquals(parseTime("2012-04-25 09:55:47.799"), logcat.getStartTime());
+        assertEquals(parseTime("2012-04-25 18:33:27.273"), logcat.getStopTime());
+        assertEquals(6, logcat.getEvents().size());
+        assertEquals(2, logcat.getAnrs().size());
+        assertEquals(2, logcat.getJavaCrashes().size());
+        assertEquals(2, logcat.getNativeCrashes().size());
+
+        assertEquals(312, logcat.getAnrs().get(0).getPid().intValue());
+        assertEquals(366, logcat.getAnrs().get(0).getTid().intValue());
+        assertEquals(parseTime("2012-04-25 17:17:08.445"), logcat.getAnrs().get(0).getEventTime());
+
+        assertEquals(312, logcat.getAnrs().get(1).getPid().intValue());
+        assertEquals(366, logcat.getAnrs().get(1).getTid().intValue());
+        assertEquals(parseTime("2012-04-25 17:17:08.445"), logcat.getAnrs().get(1).getEventTime());
+
+        assertEquals(3064, logcat.getJavaCrashes().get(0).getPid().intValue());
+        assertEquals(3082, logcat.getJavaCrashes().get(0).getTid().intValue());
         assertEquals(parseTime("2012-04-25 09:55:47.799"),
                 logcat.getJavaCrashes().get(0).getEventTime());