commit a307454ba5a9eee9c3e0fb73a7114bb02c63df0f
author Steven Moreland <smoreland@google.com> Mon Jan 13 14:13:44 2020 -0800
committer Steven Moreland <smoreland@google.com> Fri Jan 17 22:49:09 2020 +0000
tree 56ababcd82dd1ee37f40d966e9304d03e8a2f7b1
parent b670f124dc0bc9dac2802bb408825411d23000f9

libbpf_android doesn't use libnetdutils

Remove libnetdutils dependency because bpf is being used for things other
than networking these days, and we don't want to make libnetdutils
vendor-available in the future. libbase provides an alternative type now.

Bug: 140330870
Test: atest netd_integration_test netd_unit_test libnetdbpf_test
Test: atest bpf_benchmark (fails on unrelated synchronizeKernelRCU)

Change-Id: Iab50cf8113818606cc7d32843e51907ae02543bc

tests/benchmarks/bpf_benchmark.cpp

diff --git a/tests/benchmarks/bpf_benchmark.cpp b/tests/benchmarks/bpf_benchmark.cpp
index 2c1ed1e..12aaf95 100644
--- a/tests/benchmarks/bpf_benchmark.cpp
+++ b/tests/benchmarks/bpf_benchmark.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <benchmark/benchmark.h>
 
@@ -22,6 +23,7 @@
 
 constexpr uint32_t TEST_MAP_SIZE = 10000;
 
+using android::base::Result;
 using android::base::StringPrintf;
 using android::bpf::BpfMap;
 
@@ -33,26 +35,32 @@
 
 BENCHMARK_DEFINE_F(BpfBenchMark, MapWriteNewEntry)(benchmark::State& state) {
     for (auto _ : state) {
-        expectOk(mBpfTestMap.writeValue(state.range(0), state.range(0), BPF_NOEXIST));
+        // TODO(b/147676069) assert
+        mBpfTestMap.writeValue(state.range(0), state.range(0), BPF_NOEXIST);
     }
 }
 
 BENCHMARK_DEFINE_F(BpfBenchMark, MapUpdateEntry)(benchmark::State& state) {
     for (uint32_t i = 0; i < TEST_MAP_SIZE; i++) {
-        expectOk(mBpfTestMap.writeValue(i, i, BPF_NOEXIST));
+        // TODO(b/147676069) assert
+        mBpfTestMap.writeValue(i, i, BPF_NOEXIST);
     }
     for (auto _ : state) {
-        expectOk(mBpfTestMap.writeValue(state.range(0), state.range(0) + 1, BPF_EXIST));
+        // TODO(b/147676069) assert
+        mBpfTestMap.writeValue(state.range(0), state.range(0) + 1, BPF_EXIST);
     }
 }
 
 BENCHMARK_DEFINE_F(BpfBenchMark, MapDeleteAddEntry)(benchmark::State& state) {
     for (uint32_t i = 0; i < TEST_MAP_SIZE; i++) {
-        expectOk(mBpfTestMap.writeValue(i, i, BPF_NOEXIST));
+        // TODO(b/147676069) assert
+        mBpfTestMap.writeValue(i, i, BPF_NOEXIST);
     }
     for (auto _ : state) {
-        expectOk(mBpfTestMap.deleteValue(state.range(0)));
-        expectOk(mBpfTestMap.writeValue(state.range(0), state.range(0) + 1, BPF_NOEXIST));
+        // TODO(b/147676069) assert
+        mBpfTestMap.deleteValue(state.range(0));
+        // TODO(b/147676069) assert
+        mBpfTestMap.writeValue(state.range(0), state.range(0) + 1, BPF_NOEXIST);
     }
 }