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

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

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

Change-Id: I2edd27149afa131222799632130f8f31bba05bb8
This commit is contained in:
Suren Baghdasaryan
2021-07-28 15:02:10 +00:00
committed by Automerger Merge Worker
parent 35d68aa109 246926de41
commit b2e78267d7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/LmkdConnection.java
View File

@@ -50,7 +50,7 @@ public class LmkdConnection {
* Used to hold the data for the statsd atoms logging * Used to hold the data for the statsd atoms logging
* Must be in sync with statslog.h * 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 // connection listener interface
interface LmkdConnectionListener { interface LmkdConnectionListener {

5
services/core/java/com/android/server/am/LmkdStatsReporter.java
View File

@@ -64,11 +64,14 @@ public final class LmkdStatsReporter {
final int freeMemKb = inputData.readInt(); final int freeMemKb = inputData.readInt();
final int freeSwapKb = inputData.readInt(); final int freeSwapKb = inputData.readInt();
final int killReason = inputData.readInt(); final int killReason = inputData.readInt();
final int thrashing = inputData.readInt();
final int maxThrashing = inputData.readInt();
final String procName = inputData.readUTF(); final String procName = inputData.readUTF();
FrameworkStatsLog.write(FrameworkStatsLog.LMK_KILL_OCCURRED, uid, procName, oomScore, FrameworkStatsLog.write(FrameworkStatsLog.LMK_KILL_OCCURRED, uid, procName, oomScore,
pgFault, pgMajFault, rssInBytes, cacheInBytes, swapInBytes, processStartTimeNS, pgFault, pgMajFault, rssInBytes, cacheInBytes, swapInBytes, processStartTimeNS,
minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason)); minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason), thrashing,
maxThrashing);
} catch (IOException e) { } catch (IOException e) {
Slog.e(TAG, "Invalid buffer data. Failed to log LMK_KILL_OCCURRED"); Slog.e(TAG, "Invalid buffer data. Failed to log LMK_KILL_OCCURRED");
return; return;