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

Commit b2e78267 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "ActivityManagerService: report current and max thrashing levels" into sc-dev am: 246926de 

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

Change-Id: I2edd27149afa131222799632130f8f31bba05bb8
parents 35d68aa1 246926de

services/core/java/com/android/server/am/LmkdConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class LmkdConnection { 
     * Used to hold the data for the statsd atoms logging

     * Must be in sync with statslog.h

     */

    private static final int LMKD_REPLY_MAX_SIZE = 214;

    private static final int LMKD_REPLY_MAX_SIZE = 222;



    // connection listener interface

    interface LmkdConnectionListener {

services/core/java/com/android/server/am/LmkdStatsReporter.java

+4 −1
Original line number Diff line number Diff line
@@ -64,11 +64,14 @@ public final class LmkdStatsReporter { 
            final int freeMemKb = inputData.readInt();

            final int freeSwapKb = inputData.readInt();

            final int killReason = inputData.readInt();

            final int thrashing = inputData.readInt();

            final int maxThrashing = inputData.readInt();

            final String procName = inputData.readUTF();



            FrameworkStatsLog.write(FrameworkStatsLog.LMK_KILL_OCCURRED, uid, procName, oomScore,

                    pgFault, pgMajFault, rssInBytes, cacheInBytes, swapInBytes, processStartTimeNS,

                    minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason));

                    minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason), thrashing,

                    maxThrashing);

        } catch (IOException e) {

            Slog.e(TAG, "Invalid buffer data. Failed to log LMK_KILL_OCCURRED");

            return;