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 "Disable perfetto lock for OnSetup/OnStart/OnStart." into main

Browse source
This commit is contained in:
Treehugger Robot 2024-10-17 18:30:37 +00:00 • committed by Gerrit Code Review
commit 3b0f86784a
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
service-t/native/libs/libnetworkstats/include/netdbpf/NetworkTraceHandler.h
View file

@ -88,6 +88,13 @@ class NetworkTraceHandler
// Connects to the system Perfetto daemon and registers the trace handler.
static void InitPerfettoTracing();
// This prevents Perfetto from holding the data source lock when calling
// OnSetup, OnStart, or OnStop. The lock is still held by the LockedHandle
// returned by GetDataSourceLocked. Disabling this lock prevents a deadlock
// where OnStop holds this lock waiting for the poller to stop, but the poller
// is running the callback that is trying to acquire the lock.
static constexpr bool kRequiresCallbacksUnderLock = false;
// When isTest is true, skip non-hermetic code.
NetworkTraceHandler(bool isTest = false) : mIsTest(isTest) {}