diff options
| author | 2023-09-29 05:53:08 +0000 | |
|---|---|---|
| committer | 2023-09-29 05:53:08 +0000 | |
| commit | b0ff8a25bd6f0b10db703fea77a91e145dbb9aa2 (patch) | |
| tree | 6a4834adae4f0979a88af83212a75b5e97061fcc | |
| parent | b1778b0af1bb1ed815d5c71000f04760caa84dec (diff) | |
| parent | ebb1a85c54e32fa12fb3cd431bfef69f062f4e58 (diff) | |
Merge "use BpfMap's resetMap() for creating new maps" into main am: 838d7aeaef am: 276cb2274f am: 8857c6f5d9 am: ebb1a85c54
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2766745
Change-Id: I80d08a4a516051672c5dafc4c422ca79a1236014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/gpuservice/tests/unittests/GpuMemTest.cpp | 4 | ||||
| -rw-r--r-- | services/gpuservice/tests/unittests/GpuMemTracerTest.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/services/gpuservice/tests/unittests/GpuMemTest.cpp b/services/gpuservice/tests/unittests/GpuMemTest.cpp index 8dabe4fbdb..1f5b2889d1 100644 --- a/services/gpuservice/tests/unittests/GpuMemTest.cpp +++ b/services/gpuservice/tests/unittests/GpuMemTest.cpp @@ -66,9 +66,7 @@ public: mTestableGpuMem = TestableGpuMem(mGpuMem.get()); mTestableGpuMem.setInitialized(); errno = 0; - mTestMap = std::move(bpf::BpfMap<uint64_t, uint64_t>(BPF_MAP_TYPE_HASH, - TEST_MAP_SIZE, - BPF_F_NO_PREALLOC)); + mTestMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, BPF_F_NO_PREALLOC); EXPECT_EQ(0, errno); EXPECT_TRUE(mTestMap.isValid()); diff --git a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp index 5c042102b2..6550df9e58 100644 --- a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp +++ b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp @@ -65,9 +65,7 @@ public: mTestableGpuMem = TestableGpuMem(mGpuMem.get()); errno = 0; - mTestMap = std::move(bpf::BpfMap<uint64_t, uint64_t>(BPF_MAP_TYPE_HASH, - TEST_MAP_SIZE, - BPF_F_NO_PREALLOC)); + mTestMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE, BPF_F_NO_PREALLOC); EXPECT_EQ(0, errno); EXPECT_TRUE(mTestMap.isValid()); |