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

tests: simplify BpfMap.reset(createMap()) -> BpfMap.resetMap()

Browse Source 
BpfMap.reset(createMap()) is equivalent to newly added BpfMap.resetMap(),
except that the latter makes it impossible to screw up the Key/Value sizes.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I290986e9ae8660f3fc6f73b086d33f4ab93d6095
This commit is contained in:
Maciej Żenczykowski
2022-05-31 03:22:32 -07:00
parent ced3531ad5
commit 439bac2e56
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
netd/BpfHandlerTest.cpp
View File

@@ -21,6 +21,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#define TEST_BPF_MAP
#include "BpfHandler.h" #include "BpfHandler.h"
using namespace android::bpf; // NOLINT(google-build-using-namespace): exempted using namespace android::bpf; // NOLINT(google-build-using-namespace): exempted
@@ -55,20 +56,16 @@ class BpfHandlerTest : public ::testing::Test {
std::lock_guard guard(mBh.mMutex); std::lock_guard guard(mBh.mMutex);
ASSERT_EQ(0, setrlimitForTest()); ASSERT_EQ(0, setrlimitForTest());
mFakeCookieTagMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t), sizeof(UidTagValue), mFakeCookieTagMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeCookieTagMap); ASSERT_VALID(mFakeCookieTagMap);
mFakeStatsMapA.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(StatsKey), sizeof(StatsValue), mFakeStatsMapA.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeStatsMapA); ASSERT_VALID(mFakeStatsMapA);
mFakeConfigurationMap.reset( mFakeConfigurationMap.resetMap(BPF_MAP_TYPE_HASH, 1);
createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), 1, 0));
ASSERT_VALID(mFakeConfigurationMap); ASSERT_VALID(mFakeConfigurationMap);
mFakeUidPermissionMap.reset( mFakeUidPermissionMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeUidPermissionMap); ASSERT_VALID(mFakeUidPermissionMap);
mBh.mCookieTagMap = mFakeCookieTagMap; mBh.mCookieTagMap = mFakeCookieTagMap;

19
service/native/TrafficControllerTest.cpp
View File

@@ -36,6 +36,7 @@
#include <netdutils/MockSyscalls.h> #include <netdutils/MockSyscalls.h>
#define TEST_BPF_MAP
#include "TrafficController.h" #include "TrafficController.h"
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
#include "NetdUpdatablePublic.h" #include "NetdUpdatablePublic.h"
@@ -73,27 +74,21 @@ class TrafficControllerTest : public ::testing::Test {
std::lock_guard guard(mTc.mMutex); std::lock_guard guard(mTc.mMutex);
ASSERT_EQ(0, setrlimitForTest()); ASSERT_EQ(0, setrlimitForTest());
mFakeCookieTagMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t), sizeof(UidTagValue), mFakeCookieTagMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeCookieTagMap); ASSERT_VALID(mFakeCookieTagMap);
mFakeAppUidStatsMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(StatsValue), mFakeAppUidStatsMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeAppUidStatsMap); ASSERT_VALID(mFakeAppUidStatsMap);
mFakeStatsMapA.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(StatsKey), sizeof(StatsValue), mFakeStatsMapA.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeStatsMapA); ASSERT_VALID(mFakeStatsMapA);
mFakeConfigurationMap.reset( mFakeConfigurationMap.resetMap(BPF_MAP_TYPE_HASH, 1);
createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), 1, 0));
ASSERT_VALID(mFakeConfigurationMap); ASSERT_VALID(mFakeConfigurationMap);
mFakeUidOwnerMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(UidOwnerValue), mFakeUidOwnerMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeUidOwnerMap); ASSERT_VALID(mFakeUidOwnerMap);
mFakeUidPermissionMap.reset( mFakeUidPermissionMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE);
createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), TEST_MAP_SIZE, 0));
ASSERT_VALID(mFakeUidPermissionMap); ASSERT_VALID(mFakeUidPermissionMap);
mTc.mCookieTagMap = mFakeCookieTagMap; mTc.mCookieTagMap = mFakeCookieTagMap;