commit db40a578c4005b8e2ad910f18584c6b970fb7019
author Elliott Hughes <enh@google.com> Mon Jun 23 19:54:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 23 19:54:09 2014 +0000
tree 96f13c9a5d17ff5b6fa1e5581b0b7d4f5734c426
parent c603720aed304fdd36a5815f81eb22bd4d9968b7
parent 089d3c93adfadc25a9b66760969865812a4c49c1

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

* commit '089d3c93adfadc25a9b66760969865812a4c49c1':
  Fixing debuggerd header output.

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 211e56a..4ca6d70 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -235,7 +235,7 @@
     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 @@
       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);