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

Merge "Move Interface stats map dump to NetworkStatsService"

Browse Source
This commit is contained in:
Motomu Utsumi
2022-10-07 10:27:04 +00:00
committed by Gerrit Code Review
parent d577c39663 809a316035
commit 480ddf35f4
4 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -263,7 +263,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
StatsMapValue.class);
private TestBpfMap<UidStatsMapKey, StatsMapValue> mAppUidStatsMap = new TestBpfMap<>(
UidStatsMapKey.class, StatsMapValue.class);
private TestBpfMap<S32, StatsMapValue> mIfaceStatsMap = new TestBpfMap<>(
S32.class, StatsMapValue.class);
private NetworkStatsService mService;
private INetworkStatsSession mSession;
private AlertObserver mAlertObserver;
@@ -502,6 +503,11 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
return mAppUidStatsMap;
}
@Override
public IBpfMap<S32, StatsMapValue> getIfaceStatsMap() {
return mIfaceStatsMap;
}
@Override
public boolean isDebuggable() {
return mIsDebuggable == Boolean.TRUE;
@@ -2552,4 +2558,25 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
doReturn(null).when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpStatsMap("unknown");
}
void doTestDumpIfaceStatsMap(final String expectedIfaceName) throws Exception {
mIfaceStatsMap.insertEntry(new S32(10), new StatsMapValue(3, 3000, 3, 3000));
final String dump = getDump();
assertDumpContains(dump, "mIfaceStatsMap: OK");
assertDumpContains(dump, "ifaceIndex ifaceName rxBytes rxPackets txBytes txPackets");
assertDumpContains(dump, "10 " + expectedIfaceName + " 3000 3 3000 3");
}
@Test
public void testDumpIfaceStatsMap() throws Exception {
doReturn("wlan0").when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpIfaceStatsMap("wlan0");
}
@Test
public void testDumpIfaceStatsMapUnknownInterface() throws Exception {
doReturn(null).when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpIfaceStatsMap("unknown");
}
}