diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-07 14:58:08 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-16 15:38:50 -0700 |
| commit | 99f47a9e7c4374f2bbfc18e4a97aa7848245ea33 (patch) | |
| tree | d277c0e181a563c60703ffe8b7121c04e9ed57d2 /liblog | |
| parent | 26bb9970c463eb1209803d833799f128484864ac (diff) | |
| download | core-99f47a9e7c4374f2bbfc18e4a97aa7848245ea33.tar.gz core-99f47a9e7c4374f2bbfc18e4a97aa7848245ea33.tar.bz2 core-99f47a9e7c4374f2bbfc18e4a97aa7848245ea33.zip | |
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
Change-Id: Iea453764a1a4fc1661f461f10c641c30150e4d20
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/log_read.c | 3 | ||||
| -rw-r--r-- | liblog/log_read_kern.c | 3 | ||||
| -rw-r--r-- | liblog/logd_write.c | 5 | ||||
| -rw-r--r-- | liblog/logd_write_kern.c | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/liblog/log_read.c b/liblog/log_read.c index 15be748f4..0ff94bff1 100644 --- a/liblog/log_read.c +++ b/liblog/log_read.c @@ -196,7 +196,8 @@ static const char *LOG_NAME[LOG_ID_MAX] = { [LOG_ID_MAIN] = "main", [LOG_ID_RADIO] = "radio", [LOG_ID_EVENTS] = "events", - [LOG_ID_SYSTEM] = "system" + [LOG_ID_SYSTEM] = "system", + [LOG_ID_CRASH] = "crash", }; const char *android_log_id_to_name(log_id_t log_id) diff --git a/liblog/log_read_kern.c b/liblog/log_read_kern.c index d9a6b2e22..021fe476e 100644 --- a/liblog/log_read_kern.c +++ b/liblog/log_read_kern.c @@ -58,7 +58,8 @@ static const char *LOG_NAME[LOG_ID_MAX] = { [LOG_ID_MAIN] = "main", [LOG_ID_RADIO] = "radio", [LOG_ID_EVENTS] = "events", - [LOG_ID_SYSTEM] = "system" + [LOG_ID_SYSTEM] = "system", + [LOG_ID_CRASH] = "crash" }; const char *android_log_id_to_name(log_id_t log_id) diff --git a/liblog/logd_write.c b/liblog/logd_write.c index 9c73dade2..94722d3a4 100644 --- a/liblog/logd_write.c +++ b/liblog/logd_write.c @@ -54,7 +54,7 @@ static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER; static int logd_fd = -1; #if FAKE_LOG_DEVICE #define WEAK __attribute__((weak)) -static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1 }; +static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 }; #endif /* @@ -243,7 +243,8 @@ static const char *LOG_NAME[LOG_ID_MAX] = { [LOG_ID_MAIN] = "main", [LOG_ID_RADIO] = "radio", [LOG_ID_EVENTS] = "events", - [LOG_ID_SYSTEM] = "system" + [LOG_ID_SYSTEM] = "system", + [LOG_ID_CRASH] = "crash" }; const WEAK char *android_log_id_to_name(log_id_t log_id) diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c index 5ef349b02..c29c28f2d 100644 --- a/liblog/logd_write_kern.c +++ b/liblog/logd_write_kern.c @@ -93,6 +93,9 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr) int log_fd; if (/*(int)log_id >= 0 &&*/ (int)log_id < (int)LOG_ID_MAX) { + if (log_id == LOG_ID_CRASH) { + log_id = LOG_ID_MAIN; + } log_fd = log_fds[(int)log_id]; } else { return -EBADF; |