am e09c8a06: am e1f17ebb: Merge "Fixing debuggerd header output."

* commit 'e09c8a06a278b382626c0ee8126da99821d69a8a':
  Fixing debuggerd header output.
This commit is contained in:
Elliott Hughes 2014-06-23 19:48:56 +00:00 committed by Android Git Automerger
commit 089d3c93ad

View file

@ -235,7 +235,7 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid) {
fclose(fp);
}
_LOG(log, logtype::THREAD, "pid: %d, tid: %d, name: %s >>> %s <<<\n", pid, tid,
_LOG(log, logtype::HEADER, "pid: %d, tid: %d, name: %s >>> %s <<<\n", pid, tid,
threadname ? threadname : "UNKNOWN", procname ? procname : "UNKNOWN");
}
@ -429,11 +429,10 @@ static bool dump_sibling_thread_report(
continue;
}
log->current_tid = new_tid;
_LOG(log, logtype::THREAD, "--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---\n");
dump_thread_info(log, pid, new_tid);
log->current_tid = new_tid;
UniquePtr<Backtrace> backtrace(Backtrace::Create(pid, new_tid, map));
if (backtrace->Unwind(0)) {
dump_thread(backtrace.get(), log, total_sleep_time_usec);