generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 08bfcff0: Merge "Allow liblog to pass failure reasons to debuggerd."

Browse Source 
* commit '08bfcff0d4a931a4ed5e2a46541dc8d223482f34':
  Allow liblog to pass failure reasons to debuggerd.
This commit is contained in:
Elliott Hughes 2014-04-24 20:42:48 +00:00 committed by Android Git Automerger
commit cf57e2c645
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libc/bionic/libc_logging.cpp
View File

@ -614,7 +614,7 @@ void __fortify_chk_fail(const char* msg, uint32_t tag) {
__libc_fatal("FORTIFY_SOURCE: %s. Calling abort().", msg); __libc_fatal("FORTIFY_SOURCE: %s. Calling abort().", msg);
} }
static void __libc_fatal(const char* format, va_list args) { static void __libc_fatal(const char* tag, const char* format, va_list args) {
char msg[1024]; char msg[1024];
BufferOutputStream os(msg, sizeof(msg)); BufferOutputStream os(msg, sizeof(msg));
out_vformat(os, format, args); out_vformat(os, format, args);
@ -622,7 +622,7 @@ static void __libc_fatal(const char* format, va_list args) {
// TODO: log to stderr for the benefit of "adb shell" users. // TODO: log to stderr for the benefit of "adb shell" users.
// Log to the log for the benefit of regular app developers (whose stdout and stderr are closed). // Log to the log for the benefit of regular app developers (whose stdout and stderr are closed).
__libc_write_log(ANDROID_LOG_FATAL, "libc", msg); __libc_write_log(ANDROID_LOG_FATAL, tag, msg);
__libc_set_abort_message(msg); __libc_set_abort_message(msg);
} }
@ -630,14 +630,23 @@ static void __libc_fatal(const char* format, va_list args) {
void __libc_fatal_no_abort(const char* format, ...) { void __libc_fatal_no_abort(const char* format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
__libc_fatal(format, args); __libc_fatal("libc", format, args);
va_end(args); va_end(args);
} }
void __libc_fatal(const char* format, ...) { void __libc_fatal(const char* format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
__libc_fatal(format, args); __libc_fatal("libc", format, args);
va_end(args);
abort();
}
// This is used by liblog to implement LOG_ALWAYS_FATAL and LOG_ALWAYS_FATAL_IF.
void __android_fatal(const char* tag, const char* format, ...) {
va_list args;
va_start(args, format);
__libc_fatal(tag, format, args);
va_end(args); va_end(args);
abort(); abort();
} }

4
libc/private/libc_logging.h
View File

@ -74,8 +74,8 @@ __LIBC_HIDDEN__ void __libc_set_abort_message(const char* msg);
// Formats a message to the log (priority 'fatal'), then aborts. // Formats a message to the log (priority 'fatal'), then aborts.
// //
__LIBC_HIDDEN__ __noreturn void __libc_fatal(const char* format, ...) __LIBC_HIDDEN__ __noreturn void __libc_fatal(const char* format, ...) __printflike(1, 2);
__printflike(1, 2); __noreturn void __android_fatal(const char* tag, const char* format, ...) __printflike(2, 3);
// //
// Formats a message to the log (priority 'fatal'), but doesn't abort. // Formats a message to the log (priority 'fatal'), but doesn't abort.