Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(880)

Unified Diff: runtime/vm/thread_registry.cc

Issue 1402383003: Simplify timeline backend (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/thread_registry.h ('k') | runtime/vm/timeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/thread_registry.cc
diff --git a/runtime/vm/thread_registry.cc b/runtime/vm/thread_registry.cc
index 44c0d133460cd1aa7afda44e1d453d0a9759debe..ee21ec9ec73eca2c2b35411abb8fcc54b6fe7283 100644
--- a/runtime/vm/thread_registry.cc
+++ b/runtime/vm/thread_registry.cc
@@ -10,7 +10,6 @@
namespace dart {
ThreadRegistry::~ThreadRegistry() {
- ReclaimTimelineBlocks();
// Delete monitor.
delete monitor_;
}
@@ -67,54 +66,7 @@ void ThreadRegistry::PruneThread(Thread* thread) {
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();
-}
-
-
-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);
- }
+ entries_.RemoveAt(found_index);
}
« no previous file with comments | « runtime/vm/thread_registry.h ('k') | runtime/vm/timeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698