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

Migrate pullDiskIo

Browse Source 
Test: No cts test. Ran adb shell cmd stats pull-source 10032
Change-Id: I088cfd911e7f097ac37c485e666fe1d2fc6b3663
This commit is contained in:
Jeffrey Huang
2020-01-14 15:17:30 -08:00
parent 882f99a836
commit fdc5369e3e
3 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -806,28 +806,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
}
}
private void pullDiskIo(int tagId, long elapsedNanos, final long wallClockNanos,
List<StatsLogEventWrapper> pulledData) {
mStoragedUidIoStatsReader.readAbsolute((uid, fgCharsRead, fgCharsWrite, fgBytesRead,
fgBytesWrite, bgCharsRead, bgCharsWrite, bgBytesRead, bgBytesWrite,
fgFsync, bgFsync) -> {
StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos,
wallClockNanos);
e.writeInt(uid);
e.writeLong(fgCharsRead);
e.writeLong(fgCharsWrite);
e.writeLong(fgBytesRead);
e.writeLong(fgBytesWrite);
e.writeLong(bgCharsRead);
e.writeLong(bgCharsWrite);
e.writeLong(bgBytesRead);
e.writeLong(bgBytesWrite);
e.writeLong(fgFsync);
e.writeLong(bgFsync);
pulledData.add(e);
});
}
private void pullProcessCpuTime(int tagId, long elapsedNanos, final long wallClockNanos,
List<StatsLogEventWrapper> pulledData) {
synchronized (this) {
@@ -1161,11 +1139,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
break;
}
case StatsLog.DISK_IO: {
pullDiskIo(tagId, elapsedNanos, wallClockNanos, ret);
break;
}
case StatsLog.PROCESS_CPU_TIME: {
pullProcessCpuTime(tagId, elapsedNanos, wallClockNanos, ret);
break;

6
cmds/statsd/src/external/StatsPullerManager.cpp vendored
View File

@@ -96,12 +96,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {
{{.atomTag = android::util::PROC_STATS_PKG_PROC},
{.puller = new StatsCompanionServicePuller(android::util::PROC_STATS_PKG_PROC)}},
// Disk I/O stats per uid.
{{.atomTag = android::util::DISK_IO},
{.additiveFields = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
.coolDownNs = 3 * NS_PER_SEC,
.puller = new StatsCompanionServicePuller(android::util::DISK_IO)}},
// Process cpu stats. Min cool-down is 5 sec, inline with what AcitivityManagerService uses.
{{.atomTag = android::util::PROCESS_CPU_TIME},
{.coolDownNs = 5 * NS_PER_SEC /* min cool-down in seconds*/,

38
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -1881,12 +1881,44 @@ public class StatsPullAtomService extends SystemService {
// No op.
}
private StoragedUidIoStatsReader mStoragedUidIoStatsReader =
new StoragedUidIoStatsReader();
private void registerDiskIO() {
// No op.
int tagId = StatsLog.DISK_IO;
PullAtomMetadata metadata = PullAtomMetadata.newBuilder()
.setAdditiveFields(new int[] {2, 3, 4, 5, 6, 7, 8, 9, 10, 11})
.setCoolDownNs(3 * NS_PER_SEC)
.build();
mStatsManager.registerPullAtomCallback(
tagId,
metadata,
(atomTag, data) -> pullDiskIO(atomTag, data),
BackgroundThread.getExecutor()
);
}
private void pullDiskIO() {
// No op.
private int pullDiskIO(int atomTag, List<StatsEvent> pulledData) {
mStoragedUidIoStatsReader.readAbsolute((uid, fgCharsRead, fgCharsWrite, fgBytesRead,
fgBytesWrite, bgCharsRead, bgCharsWrite, bgBytesRead, bgBytesWrite,
fgFsync, bgFsync) -> {
StatsEvent e = StatsEvent.newBuilder()
.setAtomId(atomTag)
.writeInt(uid)
.writeLong(fgCharsRead)
.writeLong(fgCharsWrite)
.writeLong(fgBytesRead)
.writeLong(fgBytesWrite)
.writeLong(bgCharsRead)
.writeLong(bgCharsWrite)
.writeLong(bgBytesRead)
.writeLong(bgBytesWrite)
.writeLong(fgFsync)
.writeLong(bgFsync)
.build();
pulledData.add(e);
});
return StatsManager.PULL_SUCCESS;
}
private void registerPowerProfile() {