Ensure embedder timeline callbacks are called for service protocol requests

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 "lib/stacktrace.h"
@@ skipping 5872 matching lines @@
     cursor += remaining;
     remaining -= remaining;
   }
   ASSERT(cursor == output_length);
   ASSERT(remaining == 0);
 }
 
 
 static bool StreamTraceEvents(Dart_StreamConsumer consumer,
                               void* user_data,
-                              JSONStream* js,
-                              bool insert_comma) {
+                              JSONStream* js) {
   ASSERT(js != NULL);
   // Steal output from JSONStream.
   char* output = NULL;
   intptr_t output_length = 0;
   js->Steal(const_cast<const char**>(&output), &output_length);
   if (output_length < 3) {
     // Empty JSON array.
     free(output);
     return false;
   }
   // We want to send the JSON array without the leading '[' or trailing ']'
   // characters.
   ASSERT(output[0] == '[');
   ASSERT(output[output_length - 1] == ']');
   // Replace the ']' with the null character.
   output[output_length - 1] = '\0';
   char* start = &output[1];
-  if (insert_comma) {
-    output[0] = ',';
-    start = &output[0];
-  } else {
-    // We are skipping the '['.
-    output_length -= 1;
-  }
+  // We are skipping the '['.
+  output_length -= 1;
 
   DataStreamToConsumer(consumer,
                        user_data,
                        start,
                        output_length,
                        "timeline");
 
   // We stole the JSONStream's output buffer, free it.
   free(output);
 
@@ skipping 16 matching lines @@
     // Nothing has been recorded.
     return false;
   }
   Thread* T = Thread::Current();
   StackZone zone(T);
   Timeline::ReclaimCachedBlocksFromThreads();
   JSONStream js;
   IsolateTimelineEventFilter filter(isolate->main_port());
   timeline_recorder->PrintTraceEvent(&js, &filter);
   StartStreamToConsumer(consumer, user_data, "timeline");
-  bool success = StreamTraceEvents(consumer, user_data, &js, false);
+  bool success = StreamTraceEvents(consumer, user_data, &js);
   FinishStreamToConsumer(consumer, user_data, "timeline");
   return success;
 }
 
 
 DART_EXPORT void Dart_SetEmbedderTimelineCallbacks(
     Dart_EmbedderTimelineStartRecording start_recording,
     Dart_EmbedderTimelineStopRecording stop_recording,
     Dart_EmbedderTimelineGetTimeline get_timeline) {
   if (!FLAG_support_timeline) {
@@ skipping 16 matching lines @@
   // created, and no ZoneAllocated objects can be allocated.
   if (consumer == NULL) {
     return false;
   }
   TimelineEventRecorder* timeline_recorder = Timeline::recorder();
   if (timeline_recorder == NULL) {
     // Nothing has been recorded.
     return false;
   }
   Timeline::ReclaimCachedBlocksFromThreads();
+  bool success = false;
   JSONStream js;
   TimelineEventFilter filter;
   timeline_recorder->PrintTraceEvent(&js, &filter);
   StartStreamToConsumer(consumer, user_data, "timeline");
-  bool success = false;
-  if (Timeline::get_get_timeline_cb() != NULL) {
-    if (Timeline::get_get_timeline_cb()(consumer, user_data)) {
-      success = true;
-    }
-  }
-  if (StreamTraceEvents(consumer, user_data, &js, success)) {
+  if (StreamTraceEvents(consumer, user_data, &js)) {
     success = true;
   }
   FinishStreamToConsumer(consumer, user_data, "timeline");
   return success;
 }
 
 
 DART_EXPORT Dart_Handle Dart_TimelineDuration(const char* label,
                                               int64_t start_micros,
                                               int64_t end_micros) {
@@ skipping 213 matching lines @@
   return Api::Success();
 }
 #endif  // DART_PRECOMPILER
 
 
 DART_EXPORT bool Dart_IsRunningPrecompiledCode() {
   return Dart::IsRunningPrecompiledCode();
 }
 
 }  // namespace dart