ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 5503f774: am 2c55b454: Merge "Switch to the new bionic fatal logging interface."

Browse source 
* commit '5503f77495dd41f44a3d287f1f2de8fd8087198c':
  Switch to the new bionic fatal logging interface.
This commit is contained in:
Elliott Hughes 2014-05-07 20:28:29 +00:00 • committed by Android Git Automerger
commit 91070a5ef2
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
liblog/logd_write.c
View file

@ -323,6 +323,13 @@ int __android_log_write(int prio, const char *tag, const char *msg)
tag = tmp_tag; tag = tmp_tag;
} }
#if __BIONIC__
if (prio == ANDROID_LOG_FATAL) {
extern void __android_set_abort_message(const char*);
__android_set_abort_message(msg);
}
#endif
vec[0].iov_base = (unsigned char *) &prio; vec[0].iov_base = (unsigned char *) &prio;
vec[0].iov_len = 1; vec[0].iov_len = 1;
vec[1].iov_base = (void *) tag; vec[1].iov_base = (void *) tag;
@ -422,14 +429,8 @@ void __android_log_assert(const char *cond, const char *tag,
strcpy(buf, "Unspecified assertion failed"); strcpy(buf, "Unspecified assertion failed");
} }
#if __BIONIC__
// Ensure debuggerd gets to see what went wrong by keeping the C library in the loop.
extern __noreturn void __android_fatal(const char* tag, const char* format, ...) __printflike(2, 3);
__android_fatal(tag ? tag : "", "%s", buf);
#else
__android_log_write(ANDROID_LOG_FATAL, tag, buf); __android_log_write(ANDROID_LOG_FATAL, tag, buf);
__builtin_trap(); /* trap so we have a chance to debug the situation */ __builtin_trap(); /* trap so we have a chance to debug the situation */
#endif
/* NOTREACHED */ /* NOTREACHED */
} }

13
liblog/logd_write_kern.c
View file

@ -173,6 +173,13 @@ int __android_log_write(int prio, const char *tag, const char *msg)
tag = tmp_tag; tag = tmp_tag;
} }
#if __BIONIC__
if (prio == ANDROID_LOG_FATAL) {
extern void __android_set_abort_message(const char*);
__android_set_abort_message(msg);
}
#endif
vec[0].iov_base = (unsigned char *) &prio; vec[0].iov_base = (unsigned char *) &prio;
vec[0].iov_len = 1; vec[0].iov_len = 1;
vec[1].iov_base = (void *) tag; vec[1].iov_base = (void *) tag;
@ -272,14 +279,8 @@ void __android_log_assert(const char *cond, const char *tag,
strcpy(buf, "Unspecified assertion failed"); strcpy(buf, "Unspecified assertion failed");
} }
#if __BIONIC__
// Ensure debuggerd gets to see what went wrong by keeping the C library in the loop.
extern __noreturn void __android_fatal(const char* tag, const char* format, ...) __printflike(2, 3);
__android_fatal(tag ? tag : "", "%s", buf);
#else
__android_log_write(ANDROID_LOG_FATAL, tag, buf); __android_log_write(ANDROID_LOG_FATAL, tag, buf);
__builtin_trap(); /* trap so we have a chance to debug the situation */ __builtin_trap(); /* trap so we have a chance to debug the situation */
#endif
/* NOTREACHED */ /* NOTREACHED */
} }