Fix parsing of some tricky process and logcat sections

* EVENT LOG TAGS section of ancient android versions was tripping over the parser, which attempted to read it as an event log * PROCESSES section is reported to be very variable in the wild, though I don't have hands-on dumpstates with such logs. Issue: #119
mlopatkin · Dec 26, 2023 · cba4a50 · cba4a50
1 parent d5a1624
commit cba4a50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/parsers/src/main/java/name/mlopatkin/andlogview/parsers/dumpstate/DumpstateElements.java b/parsers/src/main/java/name/mlopatkin/andlogview/parsers/dumpstate/DumpstateElements.java
@@ -109,7 +109,7 @@ public static boolean isSectionEnd(CharSequence line) {
      * @return {@code true} if the section is a process list section
      */
     public static boolean isProcessSection(String sectionName) {
-        return "PROCESSES (ps -P)".equals(sectionName);
+        return "PROCESSES".equals(sectionName) || sectionName.startsWith("PROCESSES (");
     }
 
     /**
@@ -139,7 +139,8 @@ public static Optional<LogRecord.Buffer> getBufferFromLogcatSectionName(String s
     }
 
     private static boolean isLogcatSectionName(String sectionName, String bufferSectionNamePart) {
-        return sectionName.startsWith(bufferSectionNamePart + " LOG");
+        var nameWithBuffer = bufferSectionNamePart + " LOG";
+        return sectionName.equals(nameWithBuffer) || sectionName.startsWith(nameWithBuffer + " (");
     }
 
     /**

diff --git a/parsers/src/test/java/name/mlopatkin/andlogview/parsers/dumpstate/DumpstateElementsTest.java b/parsers/src/test/java/name/mlopatkin/andlogview/parsers/dumpstate/DumpstateElementsTest.java
@@ -129,7 +129,9 @@ void canDetermineNotSectionEnd(String line) {
 
     @ParameterizedTest
     @ValueSource(strings = {
-            "PROCESSES (ps -P)"
+            "PROCESSES (ps -P)",
+            "PROCESSES",
+            "PROCESSES (ps -P --abi)",
             // TODO(mlopatkin) This need more supported cases
     })
     void canDetermineProcessSection(String sectionName) {
@@ -141,7 +143,6 @@ void canDetermineProcessSection(String sectionName) {
             "PROCRANK",
             "PROCESSES AND THREADS (ps -t -p -P)",
             "PROCESSES AND THREADS",
-            "PROCESSES", // TODO(mlopatkin) this should actually be supported
     })
     void canDetermineNotProcessSection(String sectionName) {
         assertThat(DumpstateElements.isProcessSection(sectionName)).isFalse();
@@ -169,6 +170,7 @@ void canDetermineLogcatSection(String sectionName, String expectedBufferName) {
             "PROCESSES",
             "KERNEL LOG (dmesg)",
             "KERNEL LOG",
+            "EVENT LOG TAGS",
             "BINDER FAILED TRANSACTION LOG (/sys/kernel/debug/binder/failed_transaction_log)",
             "LAST RADIO LOG (parse_radio_log /proc/last_radio_log)"  // TODO(mlopatkin) Can we parse it?
     })

diff --git a/src/name/mlopatkin/andlogview/liblogcat/file/DumpstateFileDataSource.java b/src/name/mlopatkin/andlogview/liblogcat/file/DumpstateFileDataSource.java
@@ -148,7 +148,9 @@ protected ParserControl logRecord(LogRecord record) {
 
                         @Override
                         public ParserControl unparseableLine(CharSequence line) {
-                            logger.debug("Failed to parse dumpstate logcat line: " + line);
+                            if (line.length() > 0) {
+                                logger.debug("Failed to parse dumpstate logcat line: " + line);
+                            }
                             return ParserControl.proceed();
                         }
                     });