summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/loganalysis/item/KernelLogItem.java4
-rw-r--r--src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParser.java9
-rw-r--r--src/com/android/loganalysis/parser/DmesgParser.java7
-rw-r--r--src/com/android/loganalysis/parser/DvmLockSampleParser.java39
4 files changed, 31 insertions, 28 deletions
diff --git a/src/com/android/loganalysis/item/KernelLogItem.java b/src/com/android/loganalysis/item/KernelLogItem.java
index eb86972..dbd7829 100644
--- a/src/com/android/loganalysis/item/KernelLogItem.java
+++ b/src/com/android/loganalysis/item/KernelLogItem.java
@@ -51,8 +51,8 @@ public class KernelLogItem extends GenericItem {
public KernelLogItem() {
super(ATTRIBUTES);
- setAttribute(START_TIME, new Double(0.0));
- setAttribute(STOP_TIME, new Double(0.0));
+ setAttribute(START_TIME, Double.valueOf(0.0));
+ setAttribute(STOP_TIME, Double.valueOf(0.0));
setAttribute(EVENTS, new ItemList());
}
diff --git a/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParser.java b/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParser.java
index 00e0527..ccddc80 100644
--- a/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParser.java
+++ b/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParser.java
@@ -17,7 +17,6 @@
package com.android.loganalysis.parser;
import com.android.loganalysis.item.BatteryDischargeStatsInfoItem;
-import com.android.loganalysis.item.BatteryStatsSummaryInfoItem;
import com.android.loganalysis.util.NumberFormattingUtil;
import java.util.List;
@@ -29,11 +28,9 @@ import java.util.regex.Pattern;
*/
public class BatteryDischargeStatsInfoParser extends AbstractSectionParser {
- /**
- * Matches; #47: +5m5s105ms to 47 (screen-on, power-save-off, device-idle-off)
- */
- private static Pattern DISCHARGE_STEP_PATTERN = Pattern
- .compile("^.*: \\+((\\d+)h)?((\\d+)m)?((\\d+)s)?(\\d+)ms.* to (\\d+).*");
+ /** Matches; #47: +5m5s105ms to 47 (screen-on, power-save-off, device-idle-off) */
+ private static final Pattern DISCHARGE_STEP_PATTERN =
+ Pattern.compile("^.*: \\+((\\d+)h)?((\\d+)m)?((\\d+)s)?(\\d+)ms.* to (\\d+).*");
/**
* {@inheritDoc}
diff --git a/src/com/android/loganalysis/parser/DmesgParser.java b/src/com/android/loganalysis/parser/DmesgParser.java
index 8bca919..9cb11cd 100644
--- a/src/com/android/loganalysis/parser/DmesgParser.java
+++ b/src/com/android/loganalysis/parser/DmesgParser.java
@@ -17,13 +17,14 @@
package com.android.loganalysis.parser;
import com.android.loganalysis.item.DmesgActionInfoItem;
-import com.android.loganalysis.item.IItem;
-import com.google.common.annotations.VisibleForTesting;
import com.android.loganalysis.item.DmesgServiceInfoItem;
import com.android.loganalysis.item.DmesgStageInfoItem;
+import com.android.loganalysis.item.IItem;
+
+import com.google.common.annotations.VisibleForTesting;
+
import java.io.BufferedReader;
import java.io.IOException;
-import java.rmi.server.ServerCloneException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/com/android/loganalysis/parser/DvmLockSampleParser.java b/src/com/android/loganalysis/parser/DvmLockSampleParser.java
index 5de5f94..1402f02 100644
--- a/src/com/android/loganalysis/parser/DvmLockSampleParser.java
+++ b/src/com/android/loganalysis/parser/DvmLockSampleParser.java
@@ -32,28 +32,33 @@ import java.util.regex.Pattern;
*/
public class DvmLockSampleParser implements IParser {
- private static final String nameRegex = "([^,]+)";
- private static final String fileRegex = "(-|[A-Za-z]+\\.[A-Za-z]+)";
- private static final String intRegex = "(\\d+)";
+ private static final String NAME_REGEX = "([^,]+)";
+ private static final String FILE_REGEX = "(-|[A-Za-z]+\\.[A-Za-z]+)";
+ private static final String INT_REGEX = "(\\d+)";
/**
* Matches the DVM lock sample log format:
*
- * 09-04 05:40:07.809 1026 10592 I dvm_lock_sample:
+ * <p>09-04 05:40:07.809 1026 10592 I dvm_lock_sample:
* [system_server,1,Binder:1026_F,46,NetworkPolicyManagerService.java,2284,-,802,9]
*/
- private static final Pattern logContentionEventPattern = Pattern.compile(
- "\\[" + String.join(",\\s*", Arrays.asList(
- nameRegex, // Process name
- intRegex, // Process sensitivity flag
- nameRegex, // Waiting thread name
- intRegex, // Wait time
- fileRegex, // Waiting Source File
- intRegex, // Waiting Source Line
- fileRegex, // Owner File Name ("-" if the same)
- intRegex, // Owner Acquire Source Line
- intRegex // Sample Percentage
- )) + "\\]");
+ private static final Pattern LOG_CONTENTION_EVENT_PATTERN =
+ Pattern.compile(
+ "\\["
+ + String.join(
+ ",\\s*",
+ Arrays.asList(
+ NAME_REGEX, // Process name
+ INT_REGEX, // Process sensitivity flag
+ NAME_REGEX, // Waiting thread name
+ INT_REGEX, // Wait time
+ FILE_REGEX, // Waiting Source File
+ INT_REGEX, // Waiting Source Line
+ FILE_REGEX, // Owner File Name ("-" if the same)
+ INT_REGEX, // Owner Acquire Source Line
+ INT_REGEX // Sample Percentage
+ ))
+ + "\\]");
private DvmLockSampleItem mItem = new DvmLockSampleItem();
@@ -83,7 +88,7 @@ public class DvmLockSampleParser implements IParser {
DvmLockSampleItem mItem = new DvmLockSampleItem();
for (String line : lines) {
- Matcher m = logContentionEventPattern.matcher(line);
+ Matcher m = LOG_CONTENTION_EVENT_PATTERN.matcher(line);
if(m.matches()) {
mItem.setAttribute(DvmLockSampleItem.PROCESS_NAME,