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

Merge "Include zygote and drop unexpected samples"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-01 05:22:26 +00:00
committed by Android (Google) Code Review
parent 3d9b0fc963 932c71eb84
commit ae697dcd74
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -195,10 +195,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
"/system/bin/traced", // Perfetto.
"/system/bin/traced_probes", // Perfetto.
"webview_zygote",
// Temporarily excluded zygote to investigate its forking consequences in
// NativeProcessMemoryState.
// "zygote",
// "zygote64",
"zygote",
"zygote64",
};
private static final int CPU_TIME_PER_THREAD_FREQ_NUM_FREQUENCIES = 8;
@@ -1090,6 +1088,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
private void pullNativeProcessMemoryState(
int tagId, long elapsedNanos, long wallClockNanos,
List<StatsLogEventWrapper> pulledData) {
final List<String> processNames = Arrays.asList(MEMORY_INTERESTING_NATIVE_PROCESSES);
int[] pids = getPidsForCommands(MEMORY_INTERESTING_NATIVE_PROCESSES);
for (int i = 0; i < pids.length; i++) {
int pid = pids[i];
@@ -1099,6 +1098,12 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
}
int uid = getUidForPid(pid);
String processName = readCmdlineFromProcfs(pid);
// Sometimes we get here processName that is not included in the whitelist. It comes
// from forking the zygote for an app. We can ignore that sample because this process
// is collected by ProcessMemoryState.
if (!processNames.contains(processName)) {
continue;
}
StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
e.writeInt(uid);
e.writeString(processName);