Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a953d4e4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Avoid redundant overwrite of value in TimeSparseArray" into... 

Merge "Merge "Avoid redundant overwrite of value in TimeSparseArray" into udc-dev am: 7e39238a am: a9c1fd3c am: 6889f973" into udc-qpr-dev-plus-aosp am: 812e901b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090943



Change-Id: I9e8c57c2fe1e12162fcdefb3b63323274b42281f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0063f233 812e901b

services/core/java/com/android/server/power/stats/wakeups/CpuWakeupStats.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -403,10 +403,12 @@ public class CpuWakeupStats { 
     * This class stores recent unattributed activity history per subsystem.

     * This class stores recent unattributed activity history per subsystem.

     * The activity is stored as a mapping of subsystem to timestamp to uid to procstate.

     * The activity is stored as a mapping of subsystem to timestamp to uid to procstate.

     */

     */

    private static final class WakingActivityHistory {

    @VisibleForTesting

    static final class WakingActivityHistory {

        private static final long WAKING_ACTIVITY_RETENTION_MS = TimeUnit.MINUTES.toMillis(10);

        private static final long WAKING_ACTIVITY_RETENTION_MS = TimeUnit.MINUTES.toMillis(10);





        private SparseArray<TimeSparseArray<SparseIntArray>> mWakingActivity =

        @VisibleForTesting

        final SparseArray<TimeSparseArray<SparseIntArray>> mWakingActivity =

                new SparseArray<>();

                new SparseArray<>();





        void recordActivity(int subsystem, long elapsedRealtime, SparseIntArray uidProcStates) {

        void recordActivity(int subsystem, long elapsedRealtime, SparseIntArray uidProcStates) {
@@ -430,7 +432,6 @@ public class CpuWakeupStats { 
                        uidsToBlame.put(uid, uidProcStates.valueAt(i));

                        uidsToBlame.put(uid, uidProcStates.valueAt(i));

                    }

                    }

                }

                }

                wakingActivity.put(elapsedRealtime, uidsToBlame);

            }

            }

            // Limit activity history per subsystem to the last WAKING_ACTIVITY_RETENTION_MS.

            // Limit activity history per subsystem to the last WAKING_ACTIVITY_RETENTION_MS.

            // Note that the last activity is always present, even if it occurred before

            // Note that the last activity is always present, even if it occurred before

services/tests/servicestests/src/com/android/server/power/stats/wakeups/WakingActivityHistoryTest.java

0 → 100644
+154 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.power.stats.wakeups;



import static com.google.common.truth.Truth.assertThat;



import android.util.SparseIntArray;

import android.util.TimeSparseArray;



import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.server.power.stats.wakeups.CpuWakeupStats.WakingActivityHistory;



import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

public class WakingActivityHistoryTest {



    private static boolean areSame(SparseIntArray a, SparseIntArray b) {

        if (a == b) {

            return true;

        }

        if (a == null || b == null) {

            return false;

        }

        final int lenA = a.size();

        if (b.size() != lenA) {

            return false;

        }

        for (int i = 0; i < lenA; i++) {

            if (a.keyAt(i) != b.keyAt(i)) {

                return false;

            }

            if (a.valueAt(i) != b.valueAt(i)) {

                return false;

            }

        }

        return true;

    }



    @Test

    public void recordActivityAppendsUids() {

        final WakingActivityHistory history = new WakingActivityHistory();

        final int subsystem = 42;

        final long timestamp = 54;



        final SparseIntArray uids = new SparseIntArray();

        uids.put(1, 3);

        uids.put(5, 2);



        history.recordActivity(subsystem, timestamp, uids);



        assertThat(history.mWakingActivity.size()).isEqualTo(1);

        assertThat(history.mWakingActivity.contains(subsystem)).isTrue();

        assertThat(history.mWakingActivity.contains(subsystem + 1)).isFalse();

        assertThat(history.mWakingActivity.contains(subsystem - 1)).isFalse();



        final TimeSparseArray<SparseIntArray> recordedHistory = history.mWakingActivity.get(

                subsystem);



        assertThat(recordedHistory.size()).isEqualTo(1);

        assertThat(recordedHistory.indexOfKey(timestamp - 1)).isLessThan(0);

        assertThat(recordedHistory.indexOfKey(timestamp)).isAtLeast(0);

        assertThat(recordedHistory.indexOfKey(timestamp + 1)).isLessThan(0);



        SparseIntArray recordedUids = recordedHistory.get(timestamp);

        assertThat(recordedUids).isNotSameInstanceAs(uids);

        assertThat(areSame(recordedUids, uids)).isTrue();



        uids.put(1, 7);

        uids.clear();

        uids.put(10, 12);

        uids.put(17, 53);



        history.recordActivity(subsystem, timestamp, uids);



        recordedUids = recordedHistory.get(timestamp);



        assertThat(recordedUids.size()).isEqualTo(4);

        assertThat(recordedUids.indexOfKey(1)).isAtLeast(0);

        assertThat(recordedUids.get(5, -1)).isEqualTo(2);

        assertThat(recordedUids.get(10, -1)).isEqualTo(12);

        assertThat(recordedUids.get(17, -1)).isEqualTo(53);

    }



    @Test

    public void recordActivityDoesNotDeleteExistingUids() {

        final WakingActivityHistory history = new WakingActivityHistory();

        final int subsystem = 42;

        long timestamp = 101;



        final SparseIntArray uids = new SparseIntArray();

        uids.put(1, 17);

        uids.put(15, 2);

        uids.put(62, 31);



        history.recordActivity(subsystem, timestamp, uids);



        assertThat(history.mWakingActivity.size()).isEqualTo(1);

        assertThat(history.mWakingActivity.contains(subsystem)).isTrue();

        assertThat(history.mWakingActivity.contains(subsystem + 1)).isFalse();

        assertThat(history.mWakingActivity.contains(subsystem - 1)).isFalse();



        final TimeSparseArray<SparseIntArray> recordedHistory = history.mWakingActivity.get(

                subsystem);



        assertThat(recordedHistory.size()).isEqualTo(1);

        assertThat(recordedHistory.indexOfKey(timestamp - 1)).isLessThan(0);

        assertThat(recordedHistory.indexOfKey(timestamp)).isAtLeast(0);

        assertThat(recordedHistory.indexOfKey(timestamp + 1)).isLessThan(0);



        SparseIntArray recordedUids = recordedHistory.get(timestamp);

        assertThat(recordedUids).isNotSameInstanceAs(uids);

        assertThat(areSame(recordedUids, uids)).isTrue();



        uids.delete(1);

        uids.delete(15);

        uids.put(85, 39);



        history.recordActivity(subsystem, timestamp, uids);

        recordedUids = recordedHistory.get(timestamp);



        assertThat(recordedUids.size()).isEqualTo(4);

        assertThat(recordedUids.get(1, -1)).isEqualTo(17);

        assertThat(recordedUids.get(15, -1)).isEqualTo(2);

        assertThat(recordedUids.get(62, -1)).isEqualTo(31);

        assertThat(recordedUids.get(85, -1)).isEqualTo(39);



        uids.clear();

        history.recordActivity(subsystem, timestamp, uids);

        recordedUids = recordedHistory.get(timestamp);



        assertThat(recordedUids.size()).isEqualTo(4);

        assertThat(recordedUids.get(1, -1)).isEqualTo(17);

        assertThat(recordedUids.get(15, -1)).isEqualTo(2);

        assertThat(recordedUids.get(62, -1)).isEqualTo(31);

        assertThat(recordedUids.get(85, -1)).isEqualTo(39);

    }

}