Simplify timeline backend

runtime/vm/thread_registry.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/thread_registry.h"
 
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 
 namespace dart {
 
 ThreadRegistry::~ThreadRegistry() {
-  ReclaimTimelineBlocks();
   // Delete monitor.
   delete monitor_;
 }
 
 
 void ThreadRegistry::SafepointThreads() {
   MonitorLocker ml(monitor_);
   // First wait for any older rounds that are still in progress.
   while (in_rendezvous_) {
     // Assert we are not the organizer trying to nest calls to SafepointThreads.
@@ skipping 36 matching lines @@
   intptr_t found_index = -1;
   for (intptr_t index = 0; index < length; index++) {
     if (entries_.At(index).thread == thread) {
       found_index = index;
       break;
     }
   }
   if (found_index < 0) {
     return;
   }
-  {
-    TimelineEventRecorder* recorder = Timeline::recorder();
-    if (recorder != NULL) {
-      // Cleanup entry.
-      Entry& entry_to_remove = entries_[found_index];
-      ReclaimTimelineBlockLocked(&entry_to_remove);
-    }
-  }
-  if (found_index != (length - 1)) {
-    // Swap with last entry.
-    entries_.Swap(found_index, length - 1);
-  }
-  entries_.RemoveLast();
+  entries_.RemoveAt(found_index);
 }
 
 
-void ThreadRegistry::ReclaimTimelineBlocks() {
-  // Each thread that is scheduled in this isolate may have a cached timeline
-  // block. Mark these timeline blocks as finished.
-  MonitorLocker ml(monitor_);
-  TimelineEventRecorder* recorder = Timeline::recorder();
-  if (recorder != NULL) {
-    for (intptr_t i = 0; i < entries_.length(); i++) {
-      // NOTE: It is only safe to access |entry.state| here.
-      Entry& entry = entries_[i];
-      ReclaimTimelineBlockLocked(&entry);
-    }
-  }
-}
-
-
-void ThreadRegistry::ReclaimTimelineBlockLocked(Entry* entry) {
-  if (entry == NULL) {
-    return;
-  }
-  TimelineEventRecorder* recorder = Timeline::recorder();
-  if (!entry->scheduled && (entry->state.timeline_block != NULL)) {
-    // Currently unscheduled thread.
-    recorder->FinishBlock(entry->state.timeline_block);
-    entry->state.timeline_block = NULL;
-  } else if (entry->scheduled) {
-    // Currently scheduled thread.
-    Thread* thread = entry->thread;
-    // Take |Thread| lock.
-    MutexLocker thread_lock(thread->timeline_block_lock());
-    recorder->FinishBlock(thread->timeline_block());
-    thread->set_timeline_block(NULL);
-  }
-}
-
-
 ThreadRegistry::EntryIterator::EntryIterator(ThreadRegistry* registry)
     : index_(0),
       registry_(NULL) {
   Reset(registry);
 }
 
 
 ThreadRegistry::EntryIterator::~EntryIterator() {
   Reset(NULL);
 }
@@ skipping 62 matching lines @@
   for (int i = 0; i < entries_.length(); ++i) {
     const Entry& entry = entries_[i];
     if (entry.scheduled) {
       ++count;
     }
   }
   return count;
 }
 
 }  // namespace dart