joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

BpfNetworkStatsTest - cleanup

Browse source 
We note that:
  0 <= BpfMap<K,V>.getMap()
is equivalent to
  BpfMap<K,V>.isValid()

but the latter is far more kosher.

Unfortunately there is more non-kosher stuff happening in this
file, so we still need to define BPF_MAP_MAKE_VISIBLE_FOR_TESTING anyway.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I138709c6a298a2d8511b525a8349e01ab87d9455
This commit is contained in:
Maciej Żenczykowski 2022-05-17 15:53:01 -07:00
commit ffffa35ee8
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service-t/native/libs/libnetworkstats/BpfNetworkStatsTest.cpp
View file

@ -33,6 +33,7 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#define BPF_MAP_MAKE_VISIBLE_FOR_TESTING
#include "bpf/BpfMap.h"
#include "bpf/BpfUtils.h"
#include "netdbpf/BpfNetworkStats.h"
@ -80,19 +81,19 @@ class BpfNetworkStatsHelperTest : public testing::Test {
ASSERT_EQ(0, setrlimitForTest());
mFakeCookieTagMap = BpfMap<uint64_t, UidTagValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
ASSERT_LE(0, mFakeCookieTagMap.getMap());
ASSERT_TRUE(mFakeCookieTagMap.isValid());
mFakeAppUidStatsMap = BpfMap<uint32_t, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
ASSERT_LE(0, mFakeAppUidStatsMap.getMap());
ASSERT_TRUE(mFakeAppUidStatsMap.isValid());
mFakeStatsMap = BpfMap<StatsKey, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
ASSERT_LE(0, mFakeStatsMap.getMap());
ASSERT_TRUE(mFakeStatsMap.isValid());
mFakeIfaceIndexNameMap = BpfMap<uint32_t, IfaceValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
ASSERT_LE(0, mFakeIfaceIndexNameMap.getMap());
ASSERT_TRUE(mFakeIfaceIndexNameMap.isValid());
mFakeIfaceStatsMap = BpfMap<uint32_t, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
ASSERT_LE(0, mFakeIfaceStatsMap.getMap());
ASSERT_TRUE(mFakeIfaceStatsMap.isValid());
}
void expectUidTag(uint64_t cookie, uid_t uid, uint32_t tag) {