commit bfcbd2510230edf250684e281526f0debbc54f48
author Ryan Macnak <rmacnak@google.com> Thu Nov 29 22:06:20 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Nov 29 22:06:20 2018 +0000
tree 1ab911fab2e4f14eab3be4ab3706f9a2af7a2cb5
parent 6fbc7d27c47f49002cc6bfb141ab3ef5e84f09b3

[vm] Use decimal thread ids to match gdb and eu-stack.

Makes it easier to match things up between the bot test failure output and core dumps.

Change-Id: I8ed89dc67b0c46716d4bfed3ec1a7cdbc5411eea
Reviewed-on: https://dart-review.googlesource.com/c/85466
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>

runtime/vm/profiler.cc

diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
index c0f8ecb..8a0eb23 100644
--- a/runtime/vm/profiler.cc
+++ b/runtime/vm/profiler.cc
@@ -1142,8 +1142,11 @@
 
   OSThread* os_thread = OSThread::Current();
   ASSERT(os_thread != NULL);
-  OS::PrintErr("Dumping native stack trace for thread %" Px "\n",
-               OSThread::ThreadIdToIntPtr(os_thread->trace_id()));
+  Isolate* isolate = Isolate::Current();
+  const char* name = isolate == NULL ? NULL : isolate->name();
+  OS::PrintErr("thread=%" Pd ", isolate=%s(%p)\n",
+               OSThread::ThreadIdToIntPtr(os_thread->trace_id()), name,
+               isolate);
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     OS::PrintErr("Stack dump aborted because InitialRegisterCheck failed.\n");

runtime/vm/timeline.cc

diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
index 000e759..e343cdd 100644
--- a/runtime/vm/timeline.cc
+++ b/runtime/vm/timeline.cc
@@ -1540,7 +1540,7 @@
     OSThread* os_thread = OSThread::Current();
     ASSERT(os_thread != NULL);
     intptr_t tid = OSThread::ThreadIdToIntPtr(os_thread->id());
-    OS::PrintErr("StartEvent in block %p for thread %" Px "\n", this, tid);
+    OS::PrintErr("StartEvent in block %p for thread %" Pd "\n", this, tid);
   }
   return &events_[length_++];
 }

runtime/vm/timeline_analysis.cc

diff --git a/runtime/vm/timeline_analysis.cc b/runtime/vm/timeline_analysis.cc
index cb02834..10e9c47 100644
--- a/runtime/vm/timeline_analysis.cc
+++ b/runtime/vm/timeline_analysis.cc
@@ -36,7 +36,7 @@
 void TimelineAnalysisThread::Finalize() {
   blocks_.Sort(CompareBlocksLowerTimeBound);
   if (FLAG_trace_timeline_analysis) {
-    THR_Print("Thread %" Px " has %" Pd " blocks\n",
+    THR_Print("Thread %" Pd " has %" Pd " blocks\n",
               OSThread::ThreadIdToIntPtr(id_), blocks_.length());
   }
 }
@@ -255,7 +255,7 @@
   }
   TimelineAnalysisThread* thread = GetThread(tid);
   if (thread == NULL) {
-    SetError("Thread %" Px " does not exist.", OSThread::ThreadIdToIntPtr(tid));
+    SetError("Thread %" Pd " does not exist.", OSThread::ThreadIdToIntPtr(tid));
     return;
   }
   ProcessThread(thread);
@@ -305,7 +305,7 @@
 
   TimelineAnalysisThreadEventIterator it(thread);
   if (FLAG_trace_timeline_analysis) {
-    THR_Print(">>> TimelinePauses::ProcessThread %" Px "\n",
+    THR_Print(">>> TimelinePauses::ProcessThread %" Pd "\n",
               OSThread::ThreadIdToIntPtr(thread->id()));
   }
   intptr_t event_count = 0;
@@ -341,7 +341,7 @@
   // Pop remaining duration stack.
   PopFinishedDurations(kMaxInt64);
   if (FLAG_trace_timeline_analysis) {
-    THR_Print("<<< TimelinePauses::ProcessThread %" Px " had %" Pd " events\n",
+    THR_Print("<<< TimelinePauses::ProcessThread %" Pd " had %" Pd " events\n",
               OSThread::ThreadIdToIntPtr(thread->id()), event_count);
   }
 }
@@ -514,7 +514,7 @@
     TimelineAnalysisThread* tat = pauses.At(t_idx);
     ASSERT(tat != NULL);
     pauses.CalculatePauseTimesForThread(tat->id());
-    THR_Print("Thread %" Pd " (%" Px "):\n", t_idx,
+    THR_Print("Thread %" Pd " (%" Pd "):\n", t_idx,
               OSThread::ThreadIdToIntPtr(tat->id()));
     for (intptr_t j = 0; j < pauses.NumPauseInfos(); j++) {
       const TimelineLabelPauseInfo* pause_info = pauses.PauseInfoAt(j);