From daac678859e63444a1351f7eac8b471615478b48 Mon Sep 17 00:00:00 2001 From: gopinath Date: Tue, 11 Apr 2017 17:36:55 -0700 Subject: Parse additional boot information from dmesg logs Parse boot completed set time as well. This is needed to compute the total boot time in Boot time test. Additonal logs formats parsed now [ 14.638884] init: processing action (sys.boot_completed=1) Total_Boot_Time = BootLoader_Time_ms + Boot_Completed_Set_Time_ms b/36982296 Tests Run : All the tests in DmesgParserTest passed. Change-Id: I93781af937a41cedf72e7f1e5091eead5af96d1a --- src/com/android/loganalysis/parser/DmesgParser.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/com/android/loganalysis/parser/DmesgParser.java') diff --git a/src/com/android/loganalysis/parser/DmesgParser.java b/src/com/android/loganalysis/parser/DmesgParser.java index ba802cf..bd0d8e4 100644 --- a/src/com/android/loganalysis/parser/DmesgParser.java +++ b/src/com/android/loganalysis/parser/DmesgParser.java @@ -20,7 +20,6 @@ import com.android.loganalysis.item.DmesgActionInfoItem; import com.android.loganalysis.item.DmesgItem; import com.android.loganalysis.item.DmesgServiceInfoItem; import com.android.loganalysis.item.DmesgStageInfoItem; - import com.google.common.annotations.VisibleForTesting; import java.io.BufferedReader; @@ -65,12 +64,10 @@ public class DmesgParser implements IParser { String.format("%s%s", SERVICE_PREFIX, START_STAGE_PREFIX)); // Matches: init: processing action (early-init) - // must not match: init: processing action (vold.decrypt=trigger_restart_framework) private static final String START_PROCESSING_ACTION_PREFIX = String.format( - "processing action \\((?<%s>[^=]+)\\)", ACTION); + "processing action \\((?<%s>.*)\\)", ACTION); // Matches: [ 14.942872] init: processing action (early-init) - // Does not match: [ 22.361049] init: processing action (persist.sys.usb.config=* boot) private static final Pattern START_PROCESSING_ACTION = Pattern.compile( String.format("%s%s", SERVICE_PREFIX, START_PROCESSING_ACTION_PREFIX)); -- cgit v1.2.3