9774df6134
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone try and directly contact the correct debuggerd (32 bit vs 64 bit) by reading the elf information for the executable. Unfortunately, system_server makes a call to dump_backtrace_to_file and it doesn't have permissions to read the executable data, so it defaults to always contacting the 64 bit debuggerd. This CL changes the code so that all dump requests go to the 64 bit debuggerd, which reads the elf information and redirects requests for 32 bit processes to the 32 bit debuggerd. Testing: - Forced the watchdog code in system_server to dump stacks and verified that all native stacks are dumped correctly. - Verified that dumpstate and bugreport still properly dump the native processes on a 64 bit and 32 bit system. - Intentionally forced the 64 bit to 32 bit redirect to write only a byte at a time and verified there are no errors, and no dropped data. - Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes seemlessly. - Used debuggerd on a 32 bit system to dump native stacks. Bug: https://code.google.com/p/android/issues/detail?id=97024 Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
77 lines
2.6 KiB
C
77 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __CUTILS_DEBUGGER_H
|
|
#define __CUTILS_DEBUGGER_H
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#define DEBUGGER_SOCKET_NAME "android:debuggerd"
|
|
#define DEBUGGER32_SOCKET_NAME "android:debuggerd32"
|
|
#define DEBUGGER64_SOCKET_NAME DEBUGGER_SOCKET_NAME
|
|
|
|
typedef enum {
|
|
// dump a crash
|
|
DEBUGGER_ACTION_CRASH,
|
|
// dump a tombstone file
|
|
DEBUGGER_ACTION_DUMP_TOMBSTONE,
|
|
// dump a backtrace only back to the socket
|
|
DEBUGGER_ACTION_DUMP_BACKTRACE,
|
|
} debugger_action_t;
|
|
|
|
// Make sure that all values have a fixed size so that this structure
|
|
// is the same for 32 bit and 64 bit processes.
|
|
// NOTE: Any changes to this structure must also be reflected in
|
|
// bionic/linker/debugger.cpp.
|
|
typedef struct __attribute__((packed)) {
|
|
int32_t action;
|
|
pid_t tid;
|
|
uint64_t abort_msg_address;
|
|
int32_t original_si_code;
|
|
} debugger_msg_t;
|
|
|
|
/* 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.
|
|
*/
|
|
int dump_tombstone(pid_t tid, char* pathbuf, size_t pathlen);
|
|
|
|
/* Dumps a process backtrace, registers, and stack to a tombstone file (requires root).
|
|
* Stores the tombstone path in the provided buffer.
|
|
* If reading debugger data from debuggerd ever takes longer than timeout_secs
|
|
* seconds, then stop and return an error.
|
|
* Returns 0 on success, -1 on error.
|
|
*/
|
|
int dump_tombstone_timeout(pid_t tid, char* pathbuf, size_t pathlen, int timeout_secs);
|
|
|
|
/* Dumps a process backtrace only to the specified file (requires root).
|
|
* Returns 0 on success, -1 on error.
|
|
*/
|
|
int dump_backtrace_to_file(pid_t tid, int fd);
|
|
|
|
/* Dumps a process backtrace only to the specified file (requires root).
|
|
* If reading debugger data from debuggerd ever takes longer than timeout_secs
|
|
* seconds, then stop and return an error.
|
|
* Returns 0 on success, -1 on error.
|
|
*/
|
|
int dump_backtrace_to_file_timeout(pid_t tid, int fd, int timeout_secs);
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* __CUTILS_DEBUGGER_H */
|