diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-13 22:54:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-13 22:54:00 +0000 |
| commit | 07bb3f1e0b86199b3a62dd0d4a5f24c6dab70c65 (patch) | |
| tree | f2ef0689376cfec292fbc9a14d027f2472409d30 /include | |
| parent | bb7f515ad3d3d25a0b93978b251bc9005eec848a (diff) | |
| parent | 07dda6b57c6a476177b68ad42966f24cbbdb04c1 (diff) | |
| download | system_core-07bb3f1e0b86199b3a62dd0d4a5f24c6dab70c65.zip system_core-07bb3f1e0b86199b3a62dd0d4a5f24c6dab70c65.tar.gz system_core-07bb3f1e0b86199b3a62dd0d4a5f24c6dab70c65.tar.bz2 | |
am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
Use the correct debuggerd given the tid.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/debugger.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/cutils/debugger.h b/include/cutils/debugger.h index ae6bfc4..4bcc8e6 100644 --- a/include/cutils/debugger.h +++ b/include/cutils/debugger.h @@ -23,10 +23,13 @@ extern "C" { #endif -#if __LP64__ -#define DEBUGGER_SOCKET_NAME "android:debuggerd64" +#define DEBUGGER32_SOCKET_NAME "android:debuggerd" +#define DEBUGGER64_SOCKET_NAME "android:debuggerd64" + +#if defined(__LP64__) +#define DEBUGGER_SOCKET_NAME DEBUGGER64_SOCKET_NAME #else -#define DEBUGGER_SOCKET_NAME "android:debuggerd" +#define DEBUGGER_SOCKET_NAME DEBUGGER32_SOCKET_NAME #endif typedef enum { @@ -45,6 +48,16 @@ typedef struct { int32_t original_si_code; } debugger_msg_t; +#if defined(__LP64__) +// For a 64 bit process to contact the 32 bit debuggerd. +typedef struct { + debugger_action_t action; + pid_t tid; + uint32_t abort_msg_address; + int32_t original_si_code; +} debugger32_msg_t; +#endif + /* Dumps a process backtrace, registers, and stack to a tombstone file (requires root). * Stores the tombstone path in the provided buffer. * Returns 0 on success, -1 on error. |