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 "debuggerd: don\'t apply timeout when wait_for_gdb is on." 

am: 6a7ddbd

* commit '6a7ddbd37dbcf764d50041670fb6065f74c00391':
  debuggerd: don't apply timeout when wait_for_gdb is on.
This commit is contained in:
Josh Gao 2016-03-17 23:14:08 +00:00 committed by android-build-merger
parent fef37ecd07 6a7ddbd37d
commit 4c319f6640
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debuggerd/debuggerd.cpp
View File

@ -248,8 +248,8 @@ static int read_request(int fd, debugger_request_t* out_request) {
return 0;
}
static bool should_attach_gdb(debugger_request_t* request) {
if (request->action == DEBUGGER_ACTION_CRASH) {
static bool should_attach_gdb(const debugger_request_t& request) {
if (request.action == DEBUGGER_ACTION_CRASH) {
return property_get_bool("debug.debuggerd.wait_for_gdb", false);
}
return false;
@ -487,7 +487,7 @@ static void worker_process(int fd, debugger_request_t& request) {
// Don't attach to the sibling threads if we want to attach gdb.
// Supposedly, it makes the process less reliable.
bool attach_gdb = should_attach_gdb(&request);
bool attach_gdb = should_attach_gdb(request);
if (attach_gdb) {
// Open all of the input devices we need to listen for VOLUMEDOWN before dropping privileges.
if (init_getevent() != 0) {
@ -563,6 +563,10 @@ static void worker_process(int fd, debugger_request_t& request) {
static void monitor_worker_process(int child_pid, const debugger_request_t& request) {
struct timespec timeout = {.tv_sec = 10, .tv_nsec = 0 };
if (should_attach_gdb(request)) {
// If wait_for_gdb is enabled, set the timeout to something large.
timeout.tv_sec = INT_MAX;
}
sigset_t signal_set;
sigemptyset(&signal_set);