diff options
author | Maciej Żenczykowski <maze@google.com> | 2023-09-29 03:59:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-29 03:59:04 +0000 |
commit | a777f26e1ed8fc230fa8b0dd06c23746211c53e8 (patch) | |
tree | 375dc5cc8523c8ae466f057f87bde63f5634b024 | |
parent | 276cb2274fc6a1770065ca9cb7b343642f136ef0 (diff) | |
parent | ecf372879bdbb2a6fef8f738fba3846e44fe0e7e (diff) | |
download | native-a777f26e1ed8fc230fa8b0dd06c23746211c53e8.tar.gz |
Merge "make it clear mGpuMemTotalMap is R/O" into main am: ecf372879b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2765953
Change-Id: I75fe2c630cdbbb92f04880684916358e1d709700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | services/gpuservice/gpumem/GpuMem.cpp | 2 | ||||
-rw-r--r-- | services/gpuservice/gpumem/include/gpumem/GpuMem.h | 4 | ||||
-rw-r--r-- | services/gpuservice/tests/unittests/TestableGpuMem.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/services/gpuservice/gpumem/GpuMem.cpp b/services/gpuservice/gpumem/GpuMem.cpp index dd3cc3bd86..141fe021ee 100644 --- a/services/gpuservice/gpumem/GpuMem.cpp +++ b/services/gpuservice/gpumem/GpuMem.cpp @@ -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); } diff --git a/services/gpuservice/gpumem/include/gpumem/GpuMem.h b/services/gpuservice/gpumem/include/gpumem/GpuMem.h index 7588b54818..9aa74d6863 100644 --- a/services/gpuservice/gpumem/include/gpumem/GpuMem.h +++ b/services/gpuservice/gpumem/include/gpumem/GpuMem.h @@ -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"; diff --git a/services/gpuservice/tests/unittests/TestableGpuMem.h b/services/gpuservice/tests/unittests/TestableGpuMem.h index 6c8becb075..f21843fe1a 100644 --- a/services/gpuservice/tests/unittests/TestableGpuMem.h +++ b/services/gpuservice/tests/unittests/TestableGpuMem.h @@ -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); } |