ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Change debuggerd client param from pid to tid" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-02-14 00:13:33 +00:00 • committed by Gerrit Code Review
commit 222ba3e8bd
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debuggerd/client/debuggerd_client.cpp
View file

@ -116,7 +116,6 @@ static std::string get_wchan_data(int fd, pid_t pid) {
bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int timeout_ms, bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int timeout_ms,
unique_fd output_fd) { unique_fd output_fd) {
pid_t pid = tid;
if (dump_type == kDebuggerdJavaBacktrace) { if (dump_type == kDebuggerdJavaBacktrace) {
// Java dumps always get sent to the tgid, so we need to resolve our tid to a tgid. // Java dumps always get sent to the tgid, so we need to resolve our tid to a tgid.
android::procinfo::ProcessInfo procinfo; android::procinfo::ProcessInfo procinfo;
@ -125,10 +124,10 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
log_error(output_fd, 0, "failed to get process info: %s", error.c_str()); log_error(output_fd, 0, "failed to get process info: %s", error.c_str());
return false; return false;
} }
pid = procinfo.pid; tid = procinfo.pid;
} }
LOG(INFO) << TAG "started dumping process " << pid; LOG(INFO) << TAG "started dumping process " << tid;
// Rather than try to deal with poll() all the way through the flow, we update // Rather than try to deal with poll() all the way through the flow, we update
// the socket timeout between each step (and only use poll() during the final // the socket timeout between each step (and only use poll() during the final
@ -172,7 +171,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
InterceptRequest req = { InterceptRequest req = {
.dump_type = dump_type, .dump_type = dump_type,
.pid = pid, .pid = tid,
}; };
// Create an intermediate pipe to pass to the other end. // Create an intermediate pipe to pass to the other end.
@ -235,8 +234,8 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
// Send the signal. // Send the signal.
const int signal = (dump_type == kDebuggerdJavaBacktrace) ? SIGQUIT : BIONIC_SIGNAL_DEBUGGER; const int signal = (dump_type == kDebuggerdJavaBacktrace) ? SIGQUIT : BIONIC_SIGNAL_DEBUGGER;
sigval val = {.sival_int = (dump_type == kDebuggerdNativeBacktrace) ? 1 : 0}; sigval val = {.sival_int = (dump_type == kDebuggerdNativeBacktrace) ? 1 : 0};
if (sigqueue(pid, signal, val) != 0) { if (sigqueue(tid, signal, val) != 0) {
log_error(output_fd, errno, "failed to send signal to pid %d", pid); log_error(output_fd, errno, "failed to send signal to pid %d", tid);
return false; return false;
} }
@ -299,7 +298,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
} }
} }
LOG(INFO) << TAG "done dumping process " << pid; LOG(INFO) << TAG "done dumping process " << tid;
return true; return true;
} }

2
debuggerd/include/debuggerd/client.h
View file

@ -26,7 +26,7 @@
// Trigger a dump of specified process to output_fd. // Trigger a dump of specified process to output_fd.
// output_fd is consumed, timeout of 0 will wait forever. // output_fd is consumed, timeout of 0 will wait forever.
bool debuggerd_trigger_dump(pid_t pid, enum DebuggerdDumpType dump_type, unsigned int timeout_ms, bool debuggerd_trigger_dump(pid_t tid, enum DebuggerdDumpType dump_type, unsigned int timeout_ms,
android::base::unique_fd output_fd); android::base::unique_fd output_fd);
int dump_backtrace_to_file(pid_t tid, enum DebuggerdDumpType dump_type, int output_fd); int dump_backtrace_to_file(pid_t tid, enum DebuggerdDumpType dump_type, int output_fd);