From 439bac2e566eb8b52981a229e4be88a05b58149c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 31 May 2022 03:22:32 -0700 Subject: [PATCH] tests: simplify BpfMap.reset(createMap()) -> BpfMap.resetMap() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: I290986e9ae8660f3fc6f73b086d33f4ab93d6095 --- netd/BpfHandlerTest.cpp | 13 +++++-------- service/native/TrafficControllerTest.cpp | 19 +++++++------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/netd/BpfHandlerTest.cpp b/netd/BpfHandlerTest.cpp index 77f1a44d46..d981401397 100644 --- a/netd/BpfHandlerTest.cpp +++ b/netd/BpfHandlerTest.cpp @@ -21,6 +21,7 @@ #include +#define TEST_BPF_MAP #include "BpfHandler.h" 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); ASSERT_EQ(0, setrlimitForTest()); - mFakeCookieTagMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t), sizeof(UidTagValue), - TEST_MAP_SIZE, 0)); + mFakeCookieTagMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeCookieTagMap); - mFakeStatsMapA.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(StatsKey), sizeof(StatsValue), - TEST_MAP_SIZE, 0)); + mFakeStatsMapA.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeStatsMapA); - mFakeConfigurationMap.reset( - createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), 1, 0)); + mFakeConfigurationMap.resetMap(BPF_MAP_TYPE_HASH, 1); ASSERT_VALID(mFakeConfigurationMap); - mFakeUidPermissionMap.reset( - createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), TEST_MAP_SIZE, 0)); + mFakeUidPermissionMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0); ASSERT_VALID(mFakeUidPermissionMap); mBh.mCookieTagMap = mFakeCookieTagMap; diff --git a/service/native/TrafficControllerTest.cpp b/service/native/TrafficControllerTest.cpp index afb55689bd..1a379b8bf2 100644 --- a/service/native/TrafficControllerTest.cpp +++ b/service/native/TrafficControllerTest.cpp @@ -36,6 +36,7 @@ #include +#define TEST_BPF_MAP #include "TrafficController.h" #include "bpf/BpfUtils.h" #include "NetdUpdatablePublic.h" @@ -73,27 +74,21 @@ class TrafficControllerTest : public ::testing::Test { std::lock_guard guard(mTc.mMutex); ASSERT_EQ(0, setrlimitForTest()); - mFakeCookieTagMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t), sizeof(UidTagValue), - TEST_MAP_SIZE, 0)); + mFakeCookieTagMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeCookieTagMap); - mFakeAppUidStatsMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(StatsValue), - TEST_MAP_SIZE, 0)); + mFakeAppUidStatsMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeAppUidStatsMap); - mFakeStatsMapA.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(StatsKey), sizeof(StatsValue), - TEST_MAP_SIZE, 0)); + mFakeStatsMapA.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeStatsMapA); - mFakeConfigurationMap.reset( - createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), 1, 0)); + mFakeConfigurationMap.resetMap(BPF_MAP_TYPE_HASH, 1); ASSERT_VALID(mFakeConfigurationMap); - mFakeUidOwnerMap.reset(createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(UidOwnerValue), - TEST_MAP_SIZE, 0)); + mFakeUidOwnerMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeUidOwnerMap); - mFakeUidPermissionMap.reset( - createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(uint8_t), TEST_MAP_SIZE, 0)); + mFakeUidPermissionMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeUidPermissionMap); mTc.mCookieTagMap = mFakeCookieTagMap;