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

am 442d41fc: Merge "Write message to stderr on __libc_fatal()"

Browse Source 
* commit '442d41fc128646d7f572da842d5d5b1918341c53':
  Write message to stderr on __libc_fatal()
This commit is contained in:
Dmitriy Ivanov 2014-07-01 22:05:49 +00:00 committed by Android Git Automerger
commit 51c812cd22
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/bionic/libc_logging.cpp
View File

@ -619,7 +619,8 @@ static void __libc_fatal(const char* format, va_list args) {
BufferOutputStream os(msg, sizeof(msg)); BufferOutputStream os(msg, sizeof(msg));
out_vformat(os, format, args); out_vformat(os, format, args);
// TODO: log to stderr for the benefit of "adb shell" users. // log to stderr for the benefit of "adb shell" users.
write(2, msg, strlen(msg));
// 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, "libc", msg);

11
linker/linker.cpp
View File

@ -168,10 +168,7 @@ static unsigned bitmask[4096];
#define DISALLOW_ALLOCATION(return_type, name, ...) \ #define DISALLOW_ALLOCATION(return_type, name, ...) \
return_type name __VA_ARGS__ \ return_type name __VA_ARGS__ \
{ \ { \
const char* msg = "ERROR: " #name " called from the dynamic linker!\n"; \ __libc_fatal("ERROR: " #name " called from the dynamic linker!\n"); \
__libc_format_log(ANDROID_LOG_FATAL, "linker", "%s", msg); \
write(2, msg, strlen(msg)); \
abort(); \
} }
DISALLOW_ALLOCATION(void*, malloc, (size_t u __unused)); DISALLOW_ALLOCATION(void*, malloc, (size_t u __unused));
DISALLOW_ALLOCATION(void, free, (void* u __unused)); DISALLOW_ALLOCATION(void, free, (void* u __unused));
@ -467,10 +464,8 @@ static ElfW(Sym)* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name,
static_cast<size_t>(s->st_size)); static_cast<size_t>(s->st_size));
return s; return s;
default: default:
const char* msg = "FATAL: Unexpected ST_BIND\n"; __libc_fatal("ERROR: Unexpected ST_BIND value: %d for '%s' in '%s'",
__libc_format_log(ANDROID_LOG_FATAL, "linker", "%s", msg); ELF_ST_BIND(s->st_info), name, si->name);
write(2, msg, strlen(msg));
abort();
} }
} }