Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a deadlock in statsd.

Browse Source 
Test: manual
Change-Id: I7676713f604699737d819ac67fe49bc5b5d8cf98
This commit is contained in:
Yao Chen
2017-12-06 15:35:50 -08:00
parent 1f272d89e3
commit 5c5eebca0e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/statsd/src/metrics/GaugeMetricProducer.cpp
View File

@@ -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*/);
}
}