Don't conflate Timeline serialized json with event type

runtime/lib/timeline.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/bootstrap_natives.h"
 
 #include "include/dart_api.h"
 
 #include "vm/native_entry.h"
 #include "vm/object.h"
@@ skipping 40 matching lines @@
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
   int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
-
+  // Convert phase to a C string and perform a sanity check.
+  const char* phase_string = phase.ToCString();
+  ASSERT(phase_string != NULL);
+  ASSERT((phase_string[0] == 'n') ||
+         (phase_string[0] == 'b') ||
+         (phase_string[0] == 'e'));
+  ASSERT(phase_string[1] == '\0');
   char* json = OS::SCreate(zone,
       "{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64 ","
       "\"ts\":%" Pd64 ",\"ph\":\"%s\",\"id\":%" Pd64 ", \"args\":%s}",
       name.ToCString(),
       category.ToCString(),
       tid,
       pid,
       start.AsInt64Value(),
-      phase.ToCString(),
+      phase_string,
       id.AsInt64Value(),
       args.ToCString());

[siva, 2015/12/30 20:21:26]

Can this json initialization stuff be moved down below the
'switch (phase_string[0]) { ... }'
statement? That way we won't be calling it for the case when
'if (event == NULL)'
is true.

I think this pattern exists in other calls too.

[Cutch, 2015/12/30 20:48:14]

Good suggestion. Done here and elsewhere.

 
   TimelineEvent* event = isolate->GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
+  switch (phase_string[0]) {
+    case 'n':
+      event->AsyncInstant("", id.AsInt64Value(), start.AsInt64Value());
+    break;
+    case 'b':
+      event->AsyncBegin("", id.AsInt64Value(), start.AsInt64Value());
+    break;
+    case 'e':
+      event->AsyncEnd("", id.AsInt64Value(), start.AsInt64Value());
+    break;
+    default:
+      UNREACHABLE();
+  }
   // json was allocated in the zone and a copy will be stored in event.
-  event->SerializedJSON(json, start.AsInt64Value(), id.AsInt64Value());
-  event->Complete();
+  event->CompleteWithPreSerializedJSON(json);
 
   return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Timeline_reportCompleteEvent, 5) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, end, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(3));
@@ skipping 24 matching lines @@
       pid,
       start.AsInt64Value(),
       duration,
       args.ToCString());
 
   TimelineEvent* event = isolate->GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
+  event->Duration("", start.AsInt64Value(), end.AsInt64Value());
   // json was allocated in the zone and a copy will be stored in event.
-  event->SerializedJSON(json, start.AsInt64Value(), end.AsInt64Value());
-  event->SetSerializedJSONIsDuration(true);
-  event->Complete();
+  event->CompleteWithPreSerializedJSON(json);
 
   return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Timeline_reportInstantEvent, 4) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(3));
@@ skipping 21 matching lines @@
       tid,
       pid,
       start.AsInt64Value(),
       args.ToCString());
 
   TimelineEvent* event = isolate->GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
+  event->Instant("", start.AsInt64Value());
   // json was allocated in the zone and a copy will be stored in event.
-  event->SerializedJSON(json, start.AsInt64Value(), 0);
-  event->Complete();
+  event->CompleteWithPreSerializedJSON(json);
 
   return Object::null();
 }
 
 }  // namespace dart