diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-15 21:45:28 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-15 21:45:28 +0000 |
commit | 01bf3fa93ec1a612dbd61c6fc0337592c4fc5d78 (patch) | |
tree | 66aeebfc039826cf129e49b53dbe5404a9351139 | |
parent | bc24c816453a038135cac4e1fed1e5b2802ec3ed (diff) | |
parent | 538c8f7276bad38cd9db35382a6c4cda09c4d050 (diff) | |
download | native-01bf3fa93ec1a612dbd61c6fc0337592c4fc5d78.tar.gz |
Snap for 10952523 from 538c8f7276bad38cd9db35382a6c4cda09c4d050 to mainline-mediaprovider-release
Change-Id: Ia506366a28772e55d72db48c6753a0d8e3c50337
-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); } |