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

am 1ecf7633: am 6ad9cd41: Merge "Change the interface for fatal logging."

Browse Source 
* commit '1ecf7633737d66cc411a4ca628fe0776b0fc5940':
  Change the interface for fatal logging.
This commit is contained in:
Elliott Hughes 2014-05-07 20:28:28 +00:00 committed by Android Git Automerger
commit 5d73936fab
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
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* tag, const char* format, va_list args) { static void __libc_fatal(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,50 +622,53 @@ static void __libc_fatal(const char* tag, 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, tag, msg); __libc_write_log(ANDROID_LOG_FATAL, "libc", msg);
__libc_set_abort_message(msg); __android_set_abort_message(msg);
} }
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("libc", format, args); __libc_fatal(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("libc", format, args); __libc_fatal(format, args);
va_end(args); va_end(args);
abort(); abort();
} }
// This is used by liblog to implement LOG_ALWAYS_FATAL and LOG_ALWAYS_FATAL_IF. void __android_set_abort_message(const char* msg) {
void __android_fatal(const char* tag, const char* format, ...) { ScopedPthreadMutexLocker locker(&gAbortMsgLock);
va_list args;
va_start(args, format); if (__abort_message_ptr == NULL) {
__libc_fatal(tag, format, args); // We must have crashed _very_ early.
va_end(args); return;
abort(); }
}
if (*__abort_message_ptr != NULL) {
// We already have an abort message.
// Assume that the first crash is the one most worth reporting.
return;
}
void __libc_set_abort_message(const char* msg) {
size_t size = sizeof(abort_msg_t) + strlen(msg) + 1; size_t size = sizeof(abort_msg_t) + strlen(msg) + 1;
void* map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); void* map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
if (map == MAP_FAILED) { if (map == MAP_FAILED) {
return; return;
} }
if (__abort_message_ptr != NULL) { // TODO: if we stick to the current "one-shot" scheme, we can remove this code and
ScopedPthreadMutexLocker locker(&gAbortMsgLock); // stop storing the size.
if (*__abort_message_ptr != NULL) { if (*__abort_message_ptr != NULL) {
munmap(*__abort_message_ptr, (*__abort_message_ptr)->size); munmap(*__abort_message_ptr, (*__abort_message_ptr)->size);
}
abort_msg_t* new_abort_message = reinterpret_cast<abort_msg_t*>(map);
new_abort_message->size = size;
strcpy(new_abort_message->msg, msg);
*__abort_message_ptr = new_abort_message;
} }
abort_msg_t* new_abort_message = reinterpret_cast<abort_msg_t*>(map);
new_abort_message->size = size;
strcpy(new_abort_message->msg, msg);
*__abort_message_ptr = new_abort_message;
} }

3
libc/private/libc_logging.h
View File

@ -68,14 +68,13 @@ struct abort_msg_t {
char msg[0]; char msg[0];
}; };
__LIBC_HIDDEN__ void __libc_set_abort_message(const char* msg); void __android_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, ...) __printflike(1, 2); __LIBC_HIDDEN__ __noreturn void __libc_fatal(const char* format, ...) __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.