Switch to a VM wide timeline recorder

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
@@ skipping 5836 matching lines @@
 }
 
 
 DART_EXPORT bool Dart_TimelineGetTrace(Dart_StreamConsumer consumer,
                                        void* user_data) {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   if (consumer == NULL) {
     return false;
   }
-  TimelineEventRecorder* timeline_recorder = isolate->timeline_event_recorder();
+  TimelineEventRecorder* timeline_recorder = Timeline::recorder();
   if (timeline_recorder == NULL) {
     // Nothing has been recorded.
     return false;
   }
   // Suspend execution of other threads while serializing to JSON.
   isolate->thread_registry()->SafepointThreads();
   JSONStream js;
-  timeline_recorder->PrintJSON(&js);
+  IsolateTimelineEventFilter filter(isolate);
+  timeline_recorder->PrintJSON(&js, &filter);
   // Resume execution of other threads.
   isolate->thread_registry()->ResumeAllThreads();
 
   // Copy output.
   char* output = NULL;
   intptr_t output_length = 0;
   js.Steal(const_cast<const char**>(&output), &output_length);
   if (output != NULL) {
     // Add one for the '\0' character.
     output_length++;
@@ skipping 92 matching lines @@
     RETURN_NULL_ERROR(label);
   }
   if (async_id == NULL) {
     RETURN_NULL_ERROR(async_id);
   }
   *async_id = -1;
   TimelineStream* stream = isolate->GetEmbedderStream();
   ASSERT(stream != NULL);
   TimelineEvent* event = stream->StartEvent();
   if (event != NULL) {
-    *async_id = event->AsyncBegin(label);
+    TimelineEventRecorder* recorder = Timeline::recorder();
+    ASSERT(recorder != NULL);
+    *async_id = recorder->GetNextAsyncId();
+    event->AsyncBegin(label, *async_id);
     event->Complete();
   }
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_TimelineAsyncInstant(const char* label,
                                                   int64_t async_id) {
   if (async_id < 0) {
     return Api::Success();
@@ skipping 28 matching lines @@
   ASSERT(stream != NULL);
   TimelineEvent* event = stream->StartEvent();
   if (event != NULL) {
     event->AsyncEnd(label, async_id);
     event->Complete();
   }
   return Api::Success();
 }
 
 }  // namespace dart