LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use BpfDump#dumpMap in NetworkStatsService dump"

Browse Source
This commit is contained in:
Motomu Utsumi
2022-09-01 05:46:55 +00:00
committed by Gerrit Code Review
parent d312e6c606 d9aa769348
commit ec94e62460
1 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -2819,24 +2819,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
if (mCookieTagMap == null) { if (mCookieTagMap == null) {
return; return;
} }
pw.println("mCookieTagMap:"); BpfDump.dumpMap(mCookieTagMap, pw, "mCookieTagMap",
pw.increaseIndent(); (key, value) -> "cookie=" + key.socketCookie
try { + " tag=0x" + Long.toHexString(value.tag)
mCookieTagMap.forEach((key, value) -> { + " uid=" + value.uid);
// value could be null if there is a concurrent entry deletion.
// http://b/220084230.
if (value != null) {
pw.println("cookie=" + key.socketCookie
+ " tag=0x" + Long.toHexString(value.tag)
+ " uid=" + value.uid);
} else {
pw.println("Entry is deleted while dumping, iterating from first entry");
}
});
} catch (ErrnoException e) {
pw.println("mCookieTagMap dump end with error: " + Os.strerror(e.errno));
}
pw.decreaseIndent();
} }
@GuardedBy("mStatsLock") @GuardedBy("mStatsLock")
@@ -2844,22 +2830,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
if (mUidCounterSetMap == null) { if (mUidCounterSetMap == null) {
return; return;
} }
pw.println("mUidCounterSetMap:"); BpfDump.dumpMap(mUidCounterSetMap, pw, "mUidCounterSetMap",
pw.increaseIndent(); (uid, set) -> "uid=" + uid.val + " set=" + set.val);
try {
mUidCounterSetMap.forEach((uid, set) -> {
// set could be null if there is a concurrent entry deletion.
// http://b/220084230.
if (set != null) {
pw.println("uid=" + uid.val + " set=" + set.val);
} else {
pw.println("Entry is deleted while dumping, iterating from first entry");
}
});
} catch (ErrnoException e) {
pw.println("mUidCounterSetMap dump end with error: " + Os.strerror(e.errno));
}
pw.decreaseIndent();
} }
@GuardedBy("mStatsLock") @GuardedBy("mStatsLock")
@@ -2867,27 +2839,13 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
if (mAppUidStatsMap == null) { if (mAppUidStatsMap == null) {
return; return;
} }
pw.println("mAppUidStatsMap:"); BpfDump.dumpMap(mAppUidStatsMap, pw, "mAppUidStatsMap",
pw.increaseIndent(); "uid rxBytes rxPackets txBytes txPackets",
pw.println("uid rxBytes rxPackets txBytes txPackets"); (key, value) -> key.uid + " "
try { + value.rxBytes + " "
mAppUidStatsMap.forEach((key, value) -> { + value.rxPackets + " "
// value could be null if there is a concurrent entry deletion. + value.txBytes + " "
// http://b/220084230. + value.txPackets);
if (value != null) {
pw.println(key.uid + " "
+ value.rxBytes + " "
+ value.rxPackets + " "
+ value.txBytes + " "
+ value.txPackets);
} else {
pw.println("Entry is deleted while dumping, iterating from first entry");
}
});
} catch (ErrnoException e) {
pw.println("mAppUidStatsMap dump end with error: " + Os.strerror(e.errno));
}
pw.decreaseIndent();
} }
private NetworkStats readNetworkStatsSummaryDev() { private NetworkStats readNetworkStatsSummaryDev() {