openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "crash_dump: defuse our signal handlers earlier." 

am: c314d4db9f

Change-Id: I84666ea2b3239e013a02891fe3ca89e44966f151
This commit is contained in:
android-build-prod (mdb) 2018-04-27 16:36:41 -07:00 committed by android-build-merger
parent 3a4c6abb2e c314d4db9f
commit e315b34fd8
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debuggerd/crash_dump.cpp
View File

@ -190,6 +190,19 @@ static bool g_tombstoned_connected = false;
static unique_fd g_tombstoned_socket;
static unique_fd g_output_fd;
static void DefuseSignalHandlers() {
// Don't try to dump ourselves.
struct sigaction action = {};
action.sa_handler = SIG_DFL;
debuggerd_register_handlers(&action);
sigset_t mask;
sigemptyset(&mask);
if (sigprocmask(SIG_SETMASK, &mask, nullptr) != 0) {
PLOG(FATAL) << "failed to set signal mask";
}
}
static void Initialize(char** argv) {
android::base::InitLogging(argv);
android::base::SetAborter([](const char* abort_msg) {
@ -213,17 +226,6 @@ static void Initialize(char** argv) {
_exit(1);
});
// Don't try to dump ourselves.
struct sigaction action = {};
action.sa_handler = SIG_DFL;
debuggerd_register_handlers(&action);
sigset_t mask;
sigemptyset(&mask);
if (sigprocmask(SIG_SETMASK, &mask, nullptr) != 0) {
PLOG(FATAL) << "failed to set signal mask";
}
}
static void ParseArgs(int argc, char** argv, pid_t* pseudothread_tid, DebuggerdDumpType* dump_type) {
@ -321,6 +323,8 @@ static pid_t wait_for_vm_process(pid_t pseudothread_tid) {
}
int main(int argc, char** argv) {
DefuseSignalHandlers();
atrace_begin(ATRACE_TAG, "before reparent");
pid_t target_process = getppid();