ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."

Browse source 
* commit '294137266378371a3d08da1d6fb82a25d5b42cea':
  Adding ABI output to debuggerd tombstones.
This commit is contained in:
Elliott Hughes 2014-06-04 21:44:21 +00:00 • committed by Android Git Automerger
commit 047a1cdd11
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
debuggerd/tombstone.cpp
View file

@ -56,6 +56,21 @@
// Must match the path defined in NativeCrashListener.java // Must match the path defined in NativeCrashListener.java
#define NCRASH_SOCKET_PATH "/data/system/ndebugsocket" #define NCRASH_SOCKET_PATH "/data/system/ndebugsocket"
// Figure out the abi based on defined macros.
#if defined(__arm__)
#define ABI_STRING "arm"
#elif defined(__aarch64__)
#define ABI_STRING "arm64"
#elif defined(__mips__)
#define ABI_STRING "mips"
#elif defined(__i386__)
#define ABI_STRING "x86"
#elif defined(__x86_64__)
#define ABI_STRING "x86_64"
#else
#error "Unsupported ABI"
#endif
static bool signal_has_si_addr(int sig) { static bool signal_has_si_addr(int sig) {
switch (sig) { switch (sig) {
case SIGBUS: case SIGBUS:
@ -157,20 +172,16 @@ static const char* get_sigcode(int signo, int code) {
return "?"; return "?";
} }
static void dump_revision_info(log_t* log) { static void dump_header_info(log_t* log) {
char fingerprint[PROPERTY_VALUE_MAX];
char revision[PROPERTY_VALUE_MAX]; char revision[PROPERTY_VALUE_MAX];
property_get("ro.build.fingerprint", fingerprint, "unknown");
property_get("ro.revision", revision, "unknown"); property_get("ro.revision", revision, "unknown");
_LOG(log, SCOPE_AT_FAULT, "Revision: '%s'\n", revision);
}
static void dump_build_info(log_t* log) {
char fingerprint[PROPERTY_VALUE_MAX];
property_get("ro.build.fingerprint", fingerprint, "unknown");
_LOG(log, SCOPE_AT_FAULT, "Build fingerprint: '%s'\n", fingerprint); _LOG(log, SCOPE_AT_FAULT, "Build fingerprint: '%s'\n", fingerprint);
_LOG(log, SCOPE_AT_FAULT, "Revision: '%s'\n", revision);
_LOG(log, SCOPE_AT_FAULT, "ABI: '%s'\n", ABI_STRING);
} }
static void dump_signal_info(log_t* log, pid_t tid, int signal, int si_code) { static void dump_signal_info(log_t* log, pid_t tid, int signal, int si_code) {
@ -632,8 +643,7 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, int si_code
_LOG(log, SCOPE_AT_FAULT, _LOG(log, SCOPE_AT_FAULT,
"*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n"); "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n");
dump_build_info(log); dump_header_info(log);
dump_revision_info(log);
dump_thread_info(log, pid, tid, SCOPE_AT_FAULT); dump_thread_info(log, pid, tid, SCOPE_AT_FAULT);
if (signal) { if (signal) {
dump_signal_info(log, tid, signal, si_code); dump_signal_info(log, tid, signal, si_code);