diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc index c0f8ecb1901..8a0eb23c6d8 100644 --- a/runtime/vm/profiler.cc +++ b/runtime/vm/profiler.cc @@ -1142,8 +1142,11 @@ void Profiler::DumpStackTrace(uword sp, uword fp, uword pc, bool for_crash) { 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"); diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc index 000e7595ba4..e343cddb4ea 100644 --- a/runtime/vm/timeline.cc +++ b/runtime/vm/timeline.cc @@ -1540,7 +1540,7 @@ TimelineEvent* TimelineEventBlock::StartEvent() { 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_++]; } diff --git a/runtime/vm/timeline_analysis.cc b/runtime/vm/timeline_analysis.cc index cb0283410b0..10e9c479d0f 100644 --- a/runtime/vm/timeline_analysis.cc +++ b/runtime/vm/timeline_analysis.cc @@ -36,7 +36,7 @@ static int CompareBlocksLowerTimeBound(TimelineEventBlock* const* a, 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 @@ void TimelinePauses::CalculatePauseTimesForThread(ThreadId tid) { } 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 @@ void TimelinePauses::ProcessThread(TimelineAnalysisThread* thread) { 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 @@ void TimelinePauses::ProcessThread(TimelineAnalysisThread* thread) { // 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 @@ void TimelinePauseTrace::Print() { 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);