diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-01-30 21:51:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-30 21:51:35 +0000 |
| commit | bd39d50624ae702009ff6e7e15885de479a52800 (patch) | |
| tree | 76314a3c611040efe79275a2ceace718300a1338 /services/core | |
| parent | 16bce33af6573e0875dcfd2220afe3582de8f62b (diff) | |
| parent | 1a5da04902ab47fb499c07ef5948450f2815e09e (diff) | |
| download | frameworks_base-bd39d50624ae702009ff6e7e15885de479a52800.zip frameworks_base-bd39d50624ae702009ff6e7e15885de479a52800.tar.gz frameworks_base-bd39d50624ae702009ff6e7e15885de479a52800.tar.bz2 | |
Merge "Record memory data in event log as we collect it for procstats."
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 23 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/EventLogTags.logtags | 5 |
2 files changed, 22 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 38a86e4..287cd6f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1855,9 +1855,14 @@ public final class ActivityManagerService extends ActivityManagerNative synchronized (ActivityManagerService.this) { if (DEBUG_PSS) Slog.d(TAG, "Collected native and kernel memory in " + (SystemClock.uptimeMillis()-start) + "ms"); - mProcessStats.addSysMemUsageLocked(memInfo.getCachedSizeKb(), - memInfo.getFreeSizeKb(), memInfo.getZramTotalSizeKb(), - memInfo.getKernelUsedSizeKb(), nativeTotalPss); + final long cachedKb = memInfo.getCachedSizeKb(); + final long freeKb = memInfo.getFreeSizeKb(); + final long zramKb = memInfo.getZramTotalSizeKb(); + final long kernelKb = memInfo.getKernelUsedSizeKb(); + EventLogTags.writeAmMeminfo(cachedKb*1024, freeKb*1024, zramKb*1024, + kernelKb*1024, nativeTotalPss*1024); + mProcessStats.addSysMemUsageLocked(cachedKb, freeKb, zramKb, kernelKb, + nativeTotalPss); } } @@ -13902,9 +13907,14 @@ public final class ActivityManagerService extends ActivityManagerNative memInfo.readMemInfo(); if (nativeProcTotalPss > 0) { synchronized (this) { - mProcessStats.addSysMemUsageLocked(memInfo.getCachedSizeKb(), - memInfo.getFreeSizeKb(), memInfo.getZramTotalSizeKb(), - memInfo.getKernelUsedSizeKb(), nativeProcTotalPss); + final long cachedKb = memInfo.getCachedSizeKb(); + final long freeKb = memInfo.getFreeSizeKb(); + final long zramKb = memInfo.getZramTotalSizeKb(); + final long kernelKb = memInfo.getKernelUsedSizeKb(); + EventLogTags.writeAmMeminfo(cachedKb*1024, freeKb*1024, zramKb*1024, + kernelKb*1024, nativeProcTotalPss*1024); + mProcessStats.addSysMemUsageLocked(cachedKb, freeKb, zramKb, kernelKb, + nativeProcTotalPss); } } if (!brief) { @@ -17107,6 +17117,7 @@ public final class ActivityManagerService extends ActivityManagerNative * Record new PSS sample for a process. */ void recordPssSample(ProcessRecord proc, int procState, long pss, long uss, long now) { + EventLogTags.writeAmPss(proc.pid, proc.uid, proc.processName, pss*1024, uss*1024); proc.lastPssTime = now; proc.baseProcessTracker.addPss(pss, uss, true, proc.pkgList); if (DEBUG_PSS) Slog.d(TAG, "PSS of " + proc.toShortString() diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags index e43e717..9a645df 100644 --- a/services/core/java/com/android/server/am/EventLogTags.logtags +++ b/services/core/java/com/android/server/am/EventLogTags.logtags @@ -98,3 +98,8 @@ option java_package com.android.server.am # Running pre boot receiver 30045 am_pre_boot (User|1|5),(Package|3) + +# Report collection of global memory state +30046 am_meminfo (CachedKb|2|2),(FreeKb|2|2),(ZramKb|2|2),(KernelKb|2|2),(NativeKb|2|2) +# Report collection of memory used by a process +30047 am_pss (Pid|1|5),(UID|1|5),(Process Name|3),(PssKb|2|2),(UssKb|2|2) |