commit e09c8a06a278b382626c0ee8126da99821d69a8a
author Elliott Hughes <enh@google.com> Mon Jun 23 19:44:22 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 23 19:44:22 2014 +0000
tree 3bb3bfe1daef4b57c52f72143d57d62a3b6af941
parent 5ff6da8c6f1a9e3f2e1dbee080fb0fbc4b547ec4
parent e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f

am e1f17ebb: Merge "Fixing debuggerd header output."

* commit 'e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f':
  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);