Make abort messages available to debuggerd.
This adds __libc_fatal, cleans up the internal logging code a bit more, and switches suitable callers over to __libc_fatal. In addition to logging, __libc_fatal stashes the message somewhere that the debuggerd signal handler can find it before calling abort. In the debuggerd signal handler, we pass this address to debuggerd so that it can come back with ptrace to read the message and present it to the user. Bug: 8531731 Change-Id: I416ec1da38a8a1b0d0a582ccd7c8aaa681ed4a29
This commit is contained in:
@@ -28,27 +28,16 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "libc_logging.h"
|
||||
|
||||
// We log to stderr for the benefit of "adb shell" users, and the log for the benefit
|
||||
// of regular app developers who want to see their asserts.
|
||||
|
||||
void __assert(const char* file, int line, const char* failed_expression) {
|
||||
const char* fmt = "%s:%d: assertion \"%s\" failed\n";
|
||||
__libc_format_log(ANDROID_LOG_FATAL, "libc", fmt, file, line, failed_expression);
|
||||
fprintf(stderr, fmt, file, line, failed_expression);
|
||||
abort();
|
||||
__libc_fatal("%s:%d: assertion \"%s\" failed", file, line, failed_expression);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
void __assert2(const char* file, int line, const char* function, const char* failed_expression) {
|
||||
const char* fmt = "%s:%d: %s: assertion \"%s\" failed\n";
|
||||
__libc_format_log(ANDROID_LOG_FATAL, "libc", fmt, file, line, function, failed_expression);
|
||||
fprintf(stderr, fmt, file, line, function, failed_expression);
|
||||
abort();
|
||||
__libc_fatal("%s:%d: %s: assertion \"%s\" failed", file, line, function, failed_expression);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user