diff options
| author | Josh Gao <jmgao@google.com> | 2016-08-13 00:41:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-13 00:41:56 +0000 |
| commit | 27259667ec1c65aa575222b09451002ecd517eb7 (patch) | |
| tree | 6fc8d915208d91d56131bdc7cdc003f09b7482ba /debuggerd/debuggerd.cpp | |
| parent | f648fb4539795e94916beb408e5a4a897cefaac7 (diff) | |
| parent | 60083bed7502d49f7e4723045b0efb16ba85db69 (diff) | |
Merge "debuggerd: remove unnecessary arguments." am: 7a746f3a68
am: 60083bed75
Change-Id: I6f575a9662319db0dffeb121e0400eaa8f8cee55
Diffstat (limited to 'debuggerd/debuggerd.cpp')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index d89e70782..12fa4e631 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -51,6 +51,8 @@ #include <private/android_filesystem_config.h> +#include <debuggerd/client.h> + #include "backtrace.h" #include "getevent.h" #include "signal_sender.h" @@ -70,7 +72,6 @@ struct debugger_request_t { pid_t pid, tid; uid_t uid, gid; uintptr_t abort_msg_address; - int32_t original_si_code; }; static void wait_for_user_action(const debugger_request_t& request) { @@ -232,7 +233,6 @@ static int read_request(int fd, debugger_request_t* out_request) { out_request->uid = cr.uid; out_request->gid = cr.gid; out_request->abort_msg_address = msg.abort_msg_address; - out_request->original_si_code = msg.original_si_code; if (msg.action == DEBUGGER_ACTION_CRASH) { // Ensure that the tid reported by the crashing process is valid. @@ -499,8 +499,8 @@ static bool perform_dump(const debugger_request_t& request, int fd, int tombston case SIGSTOP: if (request.action == DEBUGGER_ACTION_DUMP_TOMBSTONE) { ALOGV("debuggerd: stopped -- dumping to tombstone"); - engrave_tombstone(tombstone_fd, backtrace_map, request.pid, request.tid, siblings, signal, - request.original_si_code, request.abort_msg_address, amfd_data); + engrave_tombstone(tombstone_fd, backtrace_map, request.pid, request.tid, siblings, + request.abort_msg_address, amfd_data); } else if (request.action == DEBUGGER_ACTION_DUMP_BACKTRACE) { ALOGV("debuggerd: stopped -- dumping to fd"); dump_backtrace(fd, backtrace_map, request.pid, request.tid, siblings, nullptr); @@ -526,8 +526,8 @@ static bool perform_dump(const debugger_request_t& request, int fd, int tombston case SIGTRAP: ALOGV("stopped -- fatal signal\n"); *crash_signal = signal; - engrave_tombstone(tombstone_fd, backtrace_map, request.pid, request.tid, siblings, signal, - request.original_si_code, request.abort_msg_address, amfd_data); + engrave_tombstone(tombstone_fd, backtrace_map, request.pid, request.tid, siblings, + request.abort_msg_address, amfd_data); break; default: |