More timeline cleanups

runtime/vm/timeline_analysis.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/timeline_analysis.h"
 
 #include "vm/flags.h"
 #include "vm/log.h"
 #include "vm/os_thread.h"
 
@@ skipping 144 matching lines @@
 
 void TimelineAnalysis::DiscoverThreads() {
   TimelineEventBlockIterator it(recorder_);
   while (it.HasNext()) {
     TimelineEventBlock* block = it.Next();
     ASSERT(block != NULL);
     if (block->IsEmpty()) {
       // Skip empty blocks.
       continue;
     }
-    if (block->isolate() != isolate_) {
-      // Skip blocks for other isolates.
-      continue;
-    }
     if (!block->CheckBlock()) {
       if (FLAG_trace_timeline_analysis) {
         THR_Print("DiscoverThreads block %" Pd " "
                   "violates invariants.\n", block->block_index());
       }
       SetError("Block %" Pd " violates invariants. See "
                "TimelineEventBlock::CheckBlock", block->block_index());
       return;
     }
-    TimelineAnalysisThread* thread = GetOrAddThread(block->thread());
+    TimelineAnalysisThread* thread = GetOrAddThread(block->thread_id());
     ASSERT(thread != NULL);
     thread->AddBlock(block);
   }
 }
 
 
 void TimelineAnalysis::FinalizeThreads() {
   for (intptr_t i = 0; i < threads_.length(); i++) {
     TimelineAnalysisThread* thread = threads_.At(i);
     ASSERT(thread != NULL);
@@ skipping 151 matching lines @@
   labels_.Clear();
 
   TimelineAnalysisThreadEventIterator it(thread);
   if (FLAG_trace_timeline_analysis) {
     THR_Print(">>> TimelinePauses::ProcessThread %" Px "\n",
               OSThread::ThreadIdToIntPtr(thread->id()));
   }
   intptr_t event_count = 0;
   while (!has_error() && it.HasNext()) {
     TimelineEvent* event = it.Next();
+    if (event->isolate_id() != isolate_->main_port()) {
+      // Skip events that do not belong to the isolate.
+      continue;
+    }
     if (event->IsFinishedDuration()) {
       int64_t start = event->TimeOrigin();
       PopFinishedDurations(start);
       if (!CheckStack(event)) {
         SetError("Duration check fail.");
         return;
       }
       event_count++;
       Push(event);
     } else if (event->IsBeginOrEnd()) {
@@ skipping 263 matching lines @@
             MicrosecondsToMilliseconds(pause_info->inclusive_micros()));
   THR_Print("%.3f ms total executing; ",
             MicrosecondsToMilliseconds(pause_info->exclusive_micros()));
   THR_Print("%.3f ms max on stack; ",
             MicrosecondsToMilliseconds(pause_info->max_inclusive_micros()));
   THR_Print("%.3f ms max executing.\n",
             MicrosecondsToMilliseconds(pause_info->max_exclusive_micros()));
 }
 
 }  // namespace dart