Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 276cb227 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "use BpfMap's resetMap() for creating new maps" into main am: 838d7aea 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2766745



Change-Id: I98b72f678573e5b2e03f35f5f6616181a3ed78f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 976b126f 838d7aea

services/gpuservice/tests/unittests/GpuMemTest.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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());

services/gpuservice/tests/unittests/GpuMemTracerTest.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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());