joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix deadlock from outside Perfetto mutex" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-09-18 21:23:28 +00:00 • committed by Gerrit Code Review
commit a0eabde1f7
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp
View file

@ -149,18 +149,20 @@ void NetworkTracePoller::TraceIfaces(const std::vector<PacketTrace>& packets) {
}
bool NetworkTracePoller::ConsumeAll() {
std::scoped_lock<std::mutex> lock(mBufferMutex);
if (mRingBuffer == nullptr) {
ALOGW("Tracing is not active");
return false;
}
std::vector<PacketTrace> packets;
base::Result<int> ret = mRingBuffer->ConsumeAll(
[&](const PacketTrace& pkt) { packets.push_back(pkt); });
if (!ret.ok()) {
ALOGW("Failed to poll ringbuf: %s", ret.error().message().c_str());
return false;
{
std::scoped_lock<std::mutex> lock(mBufferMutex);
if (mRingBuffer == nullptr) {
ALOGW("Tracing is not active");
return false;
}
base::Result<int> ret = mRingBuffer->ConsumeAll(
[&](const PacketTrace& pkt) { packets.push_back(pkt); });
if (!ret.ok()) {
ALOGW("Failed to poll ringbuf: %s", ret.error().message().c_str());
return false;
}
}
ATRACE_INT("NetworkTracePackets", packets.size());