From 266ba396b188f68c9b2cd4838a3f2bab92b2d73a Mon Sep 17 00:00:00 2001 From: firefhy Date: Fri, 2 Aug 2024 17:47:38 +0800 Subject: [PATCH] fix can`t caputure context swithces on rooted Android 11 devices --- public/client/TracySysTrace.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/public/client/TracySysTrace.cpp b/public/client/TracySysTrace.cpp index ab777436..b692bf07 100644 --- a/public/client/TracySysTrace.cpp +++ b/public/client/TracySysTrace.cpp @@ -768,11 +768,16 @@ bool SysTraceStart( int64_t& samplingPeriod ) #endif int switchId = -1, wakeupId = -1, vsyncId = -1; - const auto switchIdStr = ReadFile( "/sys/kernel/debug/tracing/events/sched/sched_switch/id" ); + auto switchIdStr = ReadFile( "/sys/kernel/debug/tracing/events/sched/sched_switch/id" ); + if( !switchIdStr) switchIdStr = ReadFile( "/sys/kernel/tracing/events/sched/sched_switch/id" ); if( switchIdStr ) switchId = atoi( switchIdStr ); - const auto wakeupIdStr = ReadFile( "/sys/kernel/debug/tracing/events/sched/sched_wakeup/id" ); + + auto wakeupIdStr = ReadFile( "/sys/kernel/debug/tracing/events/sched/sched_wakeup/id" ); + if( !wakeupIdStr) wakeupIdStr = ReadFile( "/sys/kernel/tracing/events/sched/sched_wakeup/id" ); if( wakeupIdStr ) wakeupId = atoi( wakeupIdStr ); - const auto vsyncIdStr = ReadFile( "/sys/kernel/debug/tracing/events/drm/drm_vblank_event/id" ); + + auto vsyncIdStr = ReadFile( "/sys/kernel/debug/tracing/events/drm/drm_vblank_event/id" ); + if( !vsyncIdStr) vsyncIdStr = ReadFile( "/sys/kernel/tracing/events/drm/drm_vblank_event/id" ); if( vsyncIdStr ) vsyncId = atoi( vsyncIdStr ); TracyDebug( "sched_switch id: %i\n", switchId );