Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address race condition in procstate time tracking" into sc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-07-03 00:14:15 +00:00
committed by Android (Google) Code Review
parent e7041811c9 dc3a78354e
commit b1f548e3e4
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/BatteryStats.java
View File

@@ -16,7 +16,6 @@
package android.os; package android.os;
import static android.app.ActivityManager.PROCESS_STATE_BOUND_TOP;
import static android.os.BatteryStatsManager.NUM_WIFI_STATES; import static android.os.BatteryStatsManager.NUM_WIFI_STATES;
import static android.os.BatteryStatsManager.NUM_WIFI_SUPPL_STATES; import static android.os.BatteryStatsManager.NUM_WIFI_SUPPL_STATES;
@@ -903,9 +902,9 @@ public abstract class BatteryStats implements Parcelable {
* is not attributed to any non-critical process states. * is not attributed to any non-critical process states.
*/ */
public static final int[] CRITICAL_PROC_STATES = { public static final int[] CRITICAL_PROC_STATES = {
PROCESS_STATE_TOP, Uid.PROCESS_STATE_TOP,
PROCESS_STATE_BOUND_TOP, PROCESS_STATE_FOREGROUND_SERVICE, Uid.PROCESS_STATE_FOREGROUND_SERVICE,
PROCESS_STATE_FOREGROUND Uid.PROCESS_STATE_FOREGROUND
}; };
public abstract long getProcessStateTime(int state, long elapsedRealtimeUs, int which); public abstract long getProcessStateTime(int state, long elapsedRealtimeUs, int which);

12
core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java
View File

@@ -584,7 +584,7 @@ public class BstatsCpuTimesValidationTest {
actualCpuTimeMs += cpuTimesMs[i]; actualCpuTimeMs += cpuTimesMs[i];
} }
assertApproximateValue("Incorrect total cpu time, " + msgCpuTimes, assertApproximateValue("Incorrect total cpu time, " + msgCpuTimes,
2 * WORK_DURATION_MS, actualCpuTimeMs); WORK_DURATION_MS, actualCpuTimeMs);
batteryOffScreenOn(); batteryOffScreenOn();
} finally { } finally {
@@ -656,8 +656,14 @@ public class BstatsCpuTimesValidationTest {
} }
} }
private void assertApproximateValue(String errorPrefix, long expectedValue, long actualValue) { private void assertApproximateValue(String errorPrefix, long expectedValueMs,
assertValueRange(errorPrefix, actualValue, expectedValue * 0.5, expectedValue * 1.5); long actualValueMs) {
// Allow the actual value to be 1 second smaller than the expected.
// Also allow it to be up to 5 seconds larger, to accommodate the arbitrary
// latency introduced by BatteryExternalStatsWorker.scheduleReadProcStateCpuTimes
assertValueRange(errorPrefix, actualValueMs,
expectedValueMs - 1000,
expectedValueMs + 5000);
} }
private void assertValueRange(String errorPrefix, private void assertValueRange(String errorPrefix,