am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

// Reads the contents of the specified log device, filters out the entries

// that don't match the specified pid, and writes them to the tombstone file.

//

// If "tail" is set, we only print the last few lines.

// If "tail" is non-zero, log the last "tail" number of lines.

static EventTagMap* g_eventTagMap = NULL;

static void dump_log_file(log_t* log, pid_t pid, const char* filename,

  unsigned int tail) {

static void dump_log_file(

    log_t* log, pid_t pid, const char* filename, unsigned int tail) {

  bool first = true;

  struct logger_list* logger_list;

  while (true) {

    ssize_t actual = android_logger_list_read(logger_list, &log_entry);

    struct logger_entry* entry;

    if (actual < 0) {

      if (actual == -EINTR) {

    // because you will be writing as fast as you're reading.  Any

    // high-frequency debug diagnostics should just be written to

    // the tombstone file.

    struct logger_entry* entry = &log_entry.entry_v1;

    if (entry->pid != static_cast<int32_t>(pid)) {

      // wrong pid, ignore

      continue;

    }

    entry = &log_entry.entry_v1;

    if (first) {

      _LOG(log, logtype::LOGS, "--------- %slog %s\n",

      _LOG(log, logtype::LOGS, "%s.%03d %5d %5d %c %-8s: %s\n",

         timeBuf, entry->nsec / 1000000, entry->pid, entry->tid,

         prioChar, tag, msg);

    } while ((msg = nl));

  }

// Dumps the logs generated by the specified pid to the tombstone, from both

// "system" and "main" log devices.  Ideally we'd interleave the output.

static void dump_logs(log_t* log, pid_t pid, unsigned tail) {

static void dump_logs(log_t* log, pid_t pid, unsigned int tail) {

  dump_log_file(log, pid, "system", tail);

  dump_log_file(log, pid, "main", tail);

}