commit 089d3c93adfadc25a9b66760969865812a4c49c1
author Elliott Hughes <enh@google.com> Mon Jun 23 19:48:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 23 19:48:56 2014 +0000
tree 8f8db4d7bde992a7dcf184743a354f662b6113b4
parent ab2a7dcef3ecfe45f9906d318b1c10a82b8c61a8
parent e09c8a06a278b382626c0ee8126da99821d69a8a

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

* commit 'e09c8a06a278b382626c0ee8126da99821d69a8a':
  Fixing debuggerd header output.

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 952b58e..7482886 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);