summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yang Lu <yanglu@google.com> 2018-05-02 11:43:26 -0700
committer android-build-merger <android-build-merger@google.com> 2018-05-02 11:43:26 -0700
commit2eccd835de086ed16dde83b8303eb653fb27d376 (patch)
treec1ff1305936f2370d4d35959abe4b13553fc6793
parent3b5f3210081b8a617d6d7d4c4b5477ffc9d36d1c (diff)
parent493bb2b1195e71455a8df4dfe3aa46fd12001950 (diff)
Merge "Lock the pulling alarm handler." into pi-dev
am: 493bb2b119 Change-Id: I91bc58bf99a1834821f88aeee3f1ce99da9861e5
-rw-r--r--cmds/statsd/src/StatsLogProcessor.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp
index 521988526843..986f2ef9a0a3 100644
--- a/cmds/statsd/src/StatsLogProcessor.cpp
+++ b/cmds/statsd/src/StatsLogProcessor.cpp
@@ -502,6 +502,7 @@ void StatsLogProcessor::WriteDataToDisk(bool isShutdown) {
}
void StatsLogProcessor::informPullAlarmFired(const int64_t timestampNs) {
+ std::lock_guard<std::mutex> lock(mMetricsMutex);
mStatsPullerManager.OnAlarmFired(timestampNs);
}