diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-17 18:36:06 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-01-18 22:20:06 -0800 |
| commit | 1e980b6bc8315d00a07312b25486531247abd98c (patch) | |
| tree | 539f2c0c63fca27d5eb6ba184d658bb0e11a32d9 /libc/bionic/assert.cpp | |
| parent | e4ca88d9fa8757e4fb4056fcafa5bc15b406a2fd (diff) | |
| download | android_bionic-1e980b6bc8315d00a07312b25486531247abd98c.tar.gz android_bionic-1e980b6bc8315d00a07312b25486531247abd98c.tar.bz2 android_bionic-1e980b6bc8315d00a07312b25486531247abd98c.zip | |
Fix the duplication in the debugging code.
We had two copies of the backtrace code, and two copies of the
libcorkscrew /proc/pid/maps code. This patch gets us down to one.
We also had hacks so we could log in the malloc debugging code.
This patch pulls the non-allocating "printf" code out of the
dynamic linker so everyone can share.
This patch also makes the leak diagnostics easier to read, and
makes it possible to paste them directly into the 'stack' tool (by
using relative PCs).
This patch also fixes the stdio standard stream leak that was
causing a leak warning every time tf_daemon ran.
Bug: 7291287
Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
Diffstat (limited to 'libc/bionic/assert.cpp')
| -rw-r--r-- | libc/bionic/assert.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/bionic/assert.cpp b/libc/bionic/assert.cpp index 7c0a86018..e38c16dbc 100644 --- a/libc/bionic/assert.cpp +++ b/libc/bionic/assert.cpp @@ -32,6 +32,7 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <private/debug_format.h> #include <private/logd.h> // We log to stderr for the benefit of "adb shell" users, and the log for the benefit @@ -39,7 +40,7 @@ void __assert(const char* file, int line, const char* failed_expression) { const char* fmt = "%s:%d: assertion \"%s\" failed\n"; - __libc_android_log_print(ANDROID_LOG_FATAL, "libc", fmt, file, line, failed_expression); + __libc_format_log(ANDROID_LOG_FATAL, "libc", fmt, file, line, failed_expression); fprintf(stderr, fmt, file, line, failed_expression); abort(); /* NOTREACHED */ @@ -47,7 +48,7 @@ void __assert(const char* file, int line, const char* failed_expression) { 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_android_log_print(ANDROID_LOG_FATAL, "libc", fmt, file, line, function, failed_expression); + __libc_format_log(ANDROID_LOG_FATAL, "libc", fmt, file, line, function, failed_expression); fprintf(stderr, fmt, file, line, function, failed_expression); abort(); /* NOTREACHED */ |