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

Commit a777f26e authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "make it clear mGpuMemTotalMap is R/O" into main am: ecf37287 

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



Change-Id: I75fe2c630cdbbb92f04880684916358e1d709700
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 276cb227 ecf37287

services/gpuservice/gpumem/GpuMem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void GpuMem::initialize() { 
    mInitialized.store(true);

}



void GpuMem::setGpuMemTotalMap(bpf::BpfMap<uint64_t, uint64_t>& map) {

void GpuMem::setGpuMemTotalMap(bpf::BpfMapRO<uint64_t, uint64_t>& map) {

    mGpuMemTotalMap = std::move(map);

}

services/gpuservice/gpumem/include/gpumem/GpuMem.h

+2 −2
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ private: 
    friend class TestableGpuMem;



    // set gpu memory total map

    void setGpuMemTotalMap(bpf::BpfMap<uint64_t, uint64_t>& map);

    void setGpuMemTotalMap(bpf::BpfMapRO<uint64_t, uint64_t>& map);



    // indicate whether ebpf has been initialized

    std::atomic<bool> mInitialized = false;

    // bpf map for GPU memory total data

    android::bpf::BpfMap<uint64_t, uint64_t> mGpuMemTotalMap;

    android::bpf::BpfMapRO<uint64_t, uint64_t> mGpuMemTotalMap;



    // gpu memory tracepoint event category

    static constexpr char kGpuMemTraceGroup[] = "gpu_mem";

services/gpuservice/tests/unittests/TestableGpuMem.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public: 


    void setInitialized() { mGpuMem->mInitialized.store(true); }



    void setGpuMemTotalMap(bpf::BpfMap<uint64_t, uint64_t>& map) {

    void setGpuMemTotalMap(bpf::BpfMapRO<uint64_t, uint64_t>& map) {

        mGpuMem->setGpuMemTotalMap(map);

    }