From 5c5eebca0e50f5ceb08ad271e4f25731a5b5f95c Mon Sep 17 00:00:00 2001
From: Yao Chen <yaochen@google.com>
Date: Wed, 6 Dec 2017 15:35:50 -0800
Subject: [PATCH] Fix a deadlock in statsd.

Test: manual
Change-Id: I7676713f604699737d819ac67fe49bc5b5d8cf98
---
 cmds/statsd/src/metrics/GaugeMetricProducer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
index 50cc8d407fb98..1f6bd58b5492a 100644
--- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
@@ -203,7 +203,7 @@ void GaugeMetricProducer::onConditionChangedLocked(const bool conditionMet,
         return;
     }
     for (const auto& data : allData) {
-        onMatchedLogEvent(0, *data, false /*scheduledPull*/);
+        onMatchedLogEventLocked(0, *data, false /*scheduledPull*/);
     }
     flushIfNeededLocked(eventTime);
 }
@@ -227,7 +227,7 @@ void GaugeMetricProducer::onDataPulled(const std::vector<std::shared_ptr<LogEven
     std::lock_guard<std::mutex> lock(mMutex);
 
     for (const auto& data : allData) {
-        onMatchedLogEvent(0, *data, true /*scheduledPull*/);
+        onMatchedLogEventLocked(0, *data, true /*scheduledPull*/);
     }
 }