From 2f2e79de0c5cdf5494a54b44b8bee24c5cf2851d Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 25 Jul 2014 12:25:48 -0700 Subject: [PATCH] debuggerd: tombstone: suppress logger request for logd process (cherry pick from 45ae446cab9cfc9b6100d91b1a37c6ad82e0cb99) Change-Id: I619880342ee6febd1a6cc98d2a4f536120efc1c8 --- debuggerd/tombstone.cpp | 10 ++++++++++ debuggerd/utility.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index e44719087..df982a9be 100644 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -210,6 +210,12 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid) { } } } + // Blacklist logd, logd.reader, logd.writer, logd.auditd, logd.control ... + static const char logd[] = "logd"; + if (!strncmp(threadname, logd, sizeof(logd) - 1) + && (!threadname[sizeof(logd) - 1] || (threadname[sizeof(logd) - 1] == '.'))) { + log->should_retrieve_logcat = false; + } char procnamebuf[1024]; char* procname = NULL; @@ -450,6 +456,10 @@ static void dump_log_file( bool first = true; struct logger_list* logger_list; + if (!log->should_retrieve_logcat) { + return; + } + logger_list = android_logger_list_open( android_name_to_log_id(filename), O_RDONLY | O_NONBLOCK, tail, pid); diff --git a/debuggerd/utility.h b/debuggerd/utility.h index 31684ce50..82413b876 100644 --- a/debuggerd/utility.h +++ b/debuggerd/utility.h @@ -46,9 +46,11 @@ struct log_t{ pid_t crashed_tid; // The tid of the thread we are currently working with. pid_t current_tid; + // logd daemon crash, can block asking for logcat data, allow suppression. + bool should_retrieve_logcat; log_t() - : tfd(-1), amfd(-1), crashed_tid(-1), current_tid(-1) {} + : tfd(-1), amfd(-1), crashed_tid(-1), current_tid(-1), should_retrieve_logcat(true) {} }; // List of types of logs to simplify the logging decision in _LOG