commit 7e1ee774e981a34832a44d6911b6fb5f61f4c901
author Maciej Żenczykowski <maze@google.com> Fri Jan 17 18:46:39 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Sat Jan 18 21:11:55 2020 -0800
tree 2637533bc061e825c3b60e3b1c08d5f9d979c13a
parent 8701785e6ab032840041edc0e0cf3d1cc1fd217c

remove use of BpfMap(fd=createMap()) construction in favour of better one

Long term I'd like to eliminate BpfMap(fd) constructor entirely.

Test: builds, atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3b60d1c94205ea9ed627d7cdee8a4b6c89a3047f

libnetdbpf/BpfNetworkStatsTest.cpp

diff --git a/libnetdbpf/BpfNetworkStatsTest.cpp b/libnetdbpf/BpfNetworkStatsTest.cpp
index 469ba21..d1e10e8 100644
--- a/libnetdbpf/BpfNetworkStatsTest.cpp
+++ b/libnetdbpf/BpfNetworkStatsTest.cpp
@@ -80,24 +80,19 @@
         SKIP_IF_BPF_NOT_SUPPORTED;
         ASSERT_EQ(0, setrlimitForTest());
 
-        mFakeCookieTagMap = BpfMap<uint64_t, UidTagValue>(createMap(
-                BPF_MAP_TYPE_HASH, sizeof(uint64_t), sizeof(UidTagValue), TEST_MAP_SIZE, 0));
+        mFakeCookieTagMap = BpfMap<uint64_t, UidTagValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
         ASSERT_LE(0, mFakeCookieTagMap.getMap());
 
-        mFakeAppUidStatsMap = BpfMap<uint32_t, StatsValue>(createMap(
-                BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(StatsValue), TEST_MAP_SIZE, 0));
+        mFakeAppUidStatsMap = BpfMap<uint32_t, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
         ASSERT_LE(0, mFakeAppUidStatsMap.getMap());
 
-        mFakeStatsMap = BpfMap<StatsKey, StatsValue>(createMap(
-                BPF_MAP_TYPE_HASH, sizeof(StatsKey), sizeof(StatsValue), TEST_MAP_SIZE, 0));
+        mFakeStatsMap = BpfMap<StatsKey, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
         ASSERT_LE(0, mFakeStatsMap.getMap());
 
-        mFakeIfaceIndexNameMap = BpfMap<uint32_t, IfaceValue>(
-            createMap(BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(IfaceValue), TEST_MAP_SIZE, 0));
+        mFakeIfaceIndexNameMap = BpfMap<uint32_t, IfaceValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
         ASSERT_LE(0, mFakeIfaceIndexNameMap.getMap());
 
-        mFakeIfaceStatsMap = BpfMap<uint32_t, StatsValue>(createMap(
-                BPF_MAP_TYPE_HASH, sizeof(uint32_t), sizeof(StatsValue), TEST_MAP_SIZE, 0));
+        mFakeIfaceStatsMap = BpfMap<uint32_t, StatsValue>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, 0);
         ASSERT_LE(0, mFakeIfaceStatsMap.getMap());
     }