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

address review comments

Browse Source
This commit is contained in:
Benoit Jacob 2020-11-16 22:42:52 -05:00
parent e719e7fd58
commit 460c2b15d2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/TracySysTrace.cpp
View File

@ -855,7 +855,7 @@ static bool TrySuCommandFlag(const char* flag) {
{ {
// parent // parent
close( write_end ); close( write_end );
char buf[8] = { 0 }; char buf[8] = {};
int read_len = read( read_end, buf, sizeof buf ); int read_len = read( read_end, buf, sizeof buf );
if (read_len >= 2) { if (read_len >= 2) {
success = !memcmp(buf, "0\n", 2 ); success = !memcmp(buf, "0\n", 2 );
@ -870,6 +870,10 @@ static bool TrySuCommandFlag(const char* flag) {
// Enum identifying a method for running a command as root. // Enum identifying a method for running a command as root.
enum class HowToRunAsRoot { enum class HowToRunAsRoot {
// Our process is already root (getuid()==0). Nothing else is needed. // Our process is already root (getuid()==0). Nothing else is needed.
// This scenario happens when running a command-line program
// via `adb shell` while adbd is running as root, that is,
// $ adb root
// $ adb shell /data/local/tmp/some_program
AlreadyRunningAsRoot, AlreadyRunningAsRoot,
// The way to run a command as root is: `su -c 'command'`. // The way to run a command as root is: `su -c 'command'`.
// In this case, `command` is interpreted by a shell (not just exec'd). // In this case, `command` is interpreted by a shell (not just exec'd).
@ -961,7 +965,7 @@ static int SystemAsRoot(const char* command) {
command_format = "%s"; // just cross fingers! command_format = "%s"; // just cross fingers!
break; break;
} }
char actual_command[256] = { 0 }; char actual_command[256] = {};
snprintf(actual_command, sizeof actual_command, command_format, command); snprintf(actual_command, sizeof actual_command, command_format, command);
return system( actual_command ); return system( actual_command );
} }
@ -1045,6 +1049,10 @@ bool SysTraceStart( int64_t& samplingPeriod )
return false; return false;
#endif #endif
if (GetHowToRunAsRoot() == HowToRunAsRoot::DontKnow) {
return false;
}
if( !TraceWrite( TracingOn, sizeof( TracingOn ), "0", 2 ) ) return false; if( !TraceWrite( TracingOn, sizeof( TracingOn ), "0", 2 ) ) return false;
if( !TraceWrite( CurrentTracer, sizeof( CurrentTracer ), "nop", 4 ) ) return false; if( !TraceWrite( CurrentTracer, sizeof( CurrentTracer ), "nop", 4 ) ) return false;
TraceWrite( TraceOptions, sizeof( TraceOptions ), "norecord-cmd", 13 ); TraceWrite( TraceOptions, sizeof( TraceOptions ), "norecord-cmd", 13 );