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

Commit 06d78a15 authored by lpeter's avatar lpeter
Browse files

Implement to report the invalidation metrics back to Statsd periodically 

Flag: EXEMPT bugfix

Bug: 430272418
Test: Manual test
Change-Id: Ia31f54275c673f6ee70757352605fa36f6a3e761
parent cc53d8d8

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -4517,6 +4517,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        if (dexUseManager != null) {

            dexUseManager.systemReady();

        }



        PackageMetrics.logInvalidationMetrics();

    }



    public PackageFreezer freezePackage(String packageName, @CanBeALL @UserIdInt int userId,

services/core/java/com/android/server/pm/PackageMetrics.java

+60 −12
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ import android.text.TextUtils; 
import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseIntArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.LocalServices;

import com.android.server.SystemServiceManager;
@@ -57,6 +60,7 @@ import java.nio.file.Files; 
import java.nio.file.Path;

import java.nio.file.SimpleFileVisitor;

import java.nio.file.attribute.BasicFileAttributes;

import java.time.Duration;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.atomic.AtomicLong;
@@ -203,11 +207,18 @@ public final class PackageMetrics { 
            "static_shared_library_changed";

    public static final String STRING_TEST = "test";



    private static final long LOG_INVALIDATION_METRICS_TIMEOUT_MS = Duration.ofMinutes(

            5).toMillis();



    private final long mInstallStartTimestampMillis;

    private final SparseArray<InstallStep> mInstallSteps = new SparseArray<>();

    private final InstallRequest mInstallRequest;



    private static SystemServiceManager sSystemServiceManager = null;

    @GuardedBy("sInvalidationMetrics")

    private static SparseArray<SparseIntArray> sInvalidationMetrics = new SparseArray<>();

    @GuardedBy("sInvalidationMetrics")

    private static boolean sOkayToWrite = false;



    PackageMetrics(InstallRequest installRequest) {

        // New instance is used for tracking installation metrics only.
@@ -621,18 +632,7 @@ public final class PackageMetrics { 
     * Metrics for reporting what kind of reason to call the invalidation.

     */

    public static void reportCacheInvalidationEvent(int cacheType, int invalidationReason) {

        if (sSystemServiceManager == null) {

            sSystemServiceManager = LocalServices.getService(SystemServiceManager.class);

            if (sSystemServiceManager == null) {

                return;

            }

        }

        if (!sSystemServiceManager.isBootCompleted()) {

            return;

        }

        // TODO(b/430272418): Implement a local counter for periodic metrics reporting.

        FrameworkStatsLog.write(FrameworkStatsLog.PACKAGE_MANAGER_CACHE_INVALIDATION_REPORTED,

                cacheType, invalidationReason);

        storeInvalidationMetrics(cacheType, invalidationReason);

    }



    private static int convertPackageChangedReasonStringToInteger(String reason,
@@ -658,4 +658,52 @@ public final class PackageMetrics { 
                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_UNSPECIFIED;

        };

    }



    private static void storeInvalidationMetrics(int cacheType, int invalidationReason) {

        synchronized (sInvalidationMetrics) {

            SparseIntArray invalidationMetrics = sInvalidationMetrics.get(cacheType);

            if (invalidationMetrics == null) {

                invalidationMetrics = new SparseIntArray();

                sInvalidationMetrics.put(cacheType, invalidationMetrics);

            }

            invalidationMetrics.put(invalidationReason,

                    invalidationMetrics.get(invalidationReason) + 1);

        }

    }



    /**

     * Log invalidation metrics to statsd.

     */

    public static void logInvalidationMetrics() {

        synchronized (sInvalidationMetrics) {

            if (sSystemServiceManager == null) {

                sSystemServiceManager = LocalServices.getService(SystemServiceManager.class);

            }

            if (!sOkayToWrite && sSystemServiceManager != null

                    && sSystemServiceManager.isBootCompleted()) {

                sOkayToWrite = true;

            }

            if (sOkayToWrite) {

                final int cacheTypeSize = sInvalidationMetrics.size();

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

                    final int cacheType = sInvalidationMetrics.keyAt(i);

                    final SparseIntArray invalidationMetrics = sInvalidationMetrics.get(cacheType);

                    if (invalidationMetrics == null) {

                        continue;

                    }

                    final int reasonSize = invalidationMetrics.size();

                    for (int j = 0; j < reasonSize; j++) {

                        final int reason = invalidationMetrics.keyAt(j);

                        final int counts = invalidationMetrics.get(reason);

                        FrameworkStatsLog.write(

                                FrameworkStatsLog.PACKAGE_MANAGER_CACHE_INVALIDATION_REPORTED,

                                cacheType, reason, counts);

                    }

                }

                sInvalidationMetrics.clear();

            }

            BackgroundThread.getHandler().postDelayed(() -> logInvalidationMetrics(),

                    LOG_INVALIDATION_METRICS_TIMEOUT_MS);

        }

    }

}