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

Merge "debuggerd: tombstone: suppress logger request for logd process"

Browse source
This commit is contained in:
Mark Salyzyn 2014-07-29 23:10:11 +00:00 • committed by Gerrit Code Review
commit cddc97cb3a
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
debuggerd/tombstone.cpp
View file

@ -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 procnamebuf[1024];
char* procname = NULL; char* procname = NULL;
@ -450,6 +456,10 @@ static void dump_log_file(
bool first = true; bool first = true;
struct logger_list* logger_list; struct logger_list* logger_list;
if (!log->should_retrieve_logcat) {
return;
}
logger_list = android_logger_list_open( logger_list = android_logger_list_open(
android_name_to_log_id(filename), O_RDONLY | O_NONBLOCK, tail, pid); android_name_to_log_id(filename), O_RDONLY | O_NONBLOCK, tail, pid);

4
debuggerd/utility.h
View file

@ -46,9 +46,11 @@ struct log_t{
pid_t crashed_tid; pid_t crashed_tid;
// The tid of the thread we are currently working with. // The tid of the thread we are currently working with.
pid_t current_tid; pid_t current_tid;
// logd daemon crash, can block asking for logcat data, allow suppression.
bool should_retrieve_logcat;
log_t() 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 // List of types of logs to simplify the logging decision in _LOG