commit 666deabeb892812409756867620198e4de39b5e2
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 03 00:25:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 00:25:15 2021 +0000
tree fd526922a8fde81e026f187fd0fd4e872e06da39
parent 68feffb983b8cbddaf54b15a75efa693dd9469d0
parent db097214b109be7ca1b3ae470d4a8354c98a5b62

Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev

cmds/statsd/src/external/StatsPullerManager.cpp

diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index 8a9ec74..99c39f6 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -334,6 +334,7 @@
 }
 
 int StatsPullerManager::ForceClearPullerCache() {
+    std::lock_guard<std::mutex> _l(mLock);
     int totalCleared = 0;
     for (const auto& pulledAtom : kAllPullAtomInfo) {
         totalCleared += pulledAtom.second->ForceClearCache();
@@ -342,6 +343,7 @@
 }
 
 int StatsPullerManager::ClearPullerCacheIfNecessary(int64_t timestampNs) {
+    std::lock_guard<std::mutex> _l(mLock);
     int totalCleared = 0;
     for (const auto& pulledAtom : kAllPullAtomInfo) {
         totalCleared += pulledAtom.second->ClearCacheIfNecessary(timestampNs);