Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cddc97cb authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

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

parents 47a12389 45ae446c

debuggerd/tombstone.cpp

+10 −0
Original line number Diff line number Diff line
@@ -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);

debuggerd/utility.h

+3 −1
Original line number Diff line number Diff line
@@ -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