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

Merge "debuggerd_handler: print pid and process name."

Browse source 
am: 94b0e4f5df

Change-Id: I16ab84a436d972de08172c5235abff650609e818
This commit is contained in:
Josh Gao 2017-08-12 01:34:58 +00:00 • committed by android-build-merger
commit 4c968c1ef6
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
debuggerd/handler/debuggerd_handler.cpp
View file

@ -116,6 +116,26 @@ static void __noreturn __printflike(1, 2) fatal_errno(const char* fmt, ...) {
fatal("%s: %s", buf, strerror(err)); fatal("%s: %s", buf, strerror(err));
} }
static bool get_main_thread_name(char* buf, size_t len) {
int fd = open("/proc/self/comm", O_RDONLY | O_CLOEXEC);
if (fd == -1) {
return false;
}
ssize_t rc = read(fd, buf, len);
close(fd);
if (rc == -1) {
return false;
} else if (rc == 0) {
// Should never happen?
return false;
}
// There's a trailing newline, replace it with a NUL.
buf[rc - 1] = '\0';
return true;
}
/* /*
* Writes a summary of the signal to the log file. We do this so that, if * Writes a summary of the signal to the log file. We do this so that, if
* for some reason we're not able to contact debuggerd, there is still some * for some reason we're not able to contact debuggerd, there is still some
@ -188,8 +208,14 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
} }
} }
async_safe_format_log(ANDROID_LOG_FATAL, "libc", "Fatal signal %d (%s)%s%s in tid %d (%s)", char main_thread_name[MAX_TASK_NAME_LEN + 1];
signum, signal_name, code_desc, addr_desc, __gettid(), thread_name); if (!get_main_thread_name(main_thread_name, sizeof(main_thread_name))) {
strncpy(main_thread_name, "<unknown>", sizeof(main_thread_name));
}
async_safe_format_log(
ANDROID_LOG_FATAL, "libc", "Fatal signal %d (%s)%s%s in tid %d (%s), pid %d (%s)", signum,
signal_name, code_desc, addr_desc, __gettid(), thread_name, __getpid(), main_thread_name);
} }
/* /*