Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Fix shutdown with TRACY_NO_EXIT=1 on Android.

Browse Source
This commit is contained in:
Benoit Jacob 2020-11-24 15:03:37 -05:00
parent 0073fd739f
commit ff78d71913
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/TracySysTrace.cpp
View File

@ -784,6 +784,7 @@ static void SetupSampling( int64_t& samplingPeriod )
} }
s_ring[i].Advance( hdr.size ); s_ring[i].Advance( hdr.size );
} }
if( !traceActive.load( std::memory_order_relaxed) ) break;
if( !hadData ) if( !hadData )
{ {
std::this_thread::sleep_for( std::chrono::milliseconds( 10 ) ); std::this_thread::sleep_for( std::chrono::milliseconds( 10 ) );
@ -1179,10 +1180,12 @@ void SysTraceWorker( void* ptr )
close( pipefd[1] ); close( pipefd[1] );
sched_param sp = { 4 }; sched_param sp = { 4 };
pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp ); pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp );
execlp( "su", "su", "root", "sh", "-c",
"cat /sys/kernel/debug/tracing/trace_pipe"
#if defined __ANDROID__ && ( defined __aarch64__ || defined __ARM_ARCH ) #if defined __ANDROID__ && ( defined __aarch64__ || defined __ARM_ARCH )
execlp( "su", "su", "root", "sh", "-c", "/data/tracy_systrace", (char*)nullptr ); " || /data/tracy_systrace"
#endif #endif
execlp( "su", "su", "root", "sh", "-c", "cat /sys/kernel/debug/tracing/trace_pipe", (char*)nullptr ); , nullptr );
exit( 1 ); exit( 1 );
} }
} }
@ -1194,6 +1197,7 @@ void SysTraceWorker( void* ptr )
pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp ); pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp );
ProcessTraceLines( pipefd[0] ); ProcessTraceLines( pipefd[0] );
close( pipefd[0] ); close( pipefd[0] );
waitpid( pid, nullptr, 0 );
} }
} }
} }