Special-case Timeline.{start,finish}Sync for Fuchsia

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 93 matching lines @@
     default:
       UNREACHABLE();
   }
 
   // json was allocated in the zone and a copy will be stored in event.
   event->CompleteWithPreSerializedJSON(json);
 #endif
   return Object::null();
 }
 
+DEFINE_NATIVE_ENTRY(Timeline_reportBeginEvent, 1) {
+#if !defined(PRODUCT) && defined(HOST_OS_FUCHSIA)
+  if (!FLAG_support_timeline) {
+    return Object::null();
+  }
+  GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(0));
+
+  TimelineEventRecorder* recorder = Timeline::recorder();
+  if (recorder == NULL) {
+    return Object::null();
+  }
+
+  TimelineEvent* event = Timeline::GetDartStream()->StartEvent();
+  if (event == NULL) {
+    // Stream was turned off.
+    return Object::null();
+  }
+
+  event->Begin(strdup(name.ToCString()));
+  event->set_owns_label(true);
+  event->Complete();
+#endif  // !PRODUCT
+  return Object::null();
+}
+
 DEFINE_NATIVE_ENTRY(Timeline_reportCompleteEvent, 5) {
 #ifndef PRODUCT
   if (!FLAG_support_timeline) {
     return Object::null();
   }
-  GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
-  GET_NON_NULL_NATIVE_ARGUMENT(Integer, start_cpu, arguments->NativeArgAt(1));
-  GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(2));
-  GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(3));
-  GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(4));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
   TimelineEvent* event = Timeline::GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
 
+  GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(3));
+  GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(4));
+#if defined(HOST_OS_FUCHSIA)

[konkers, 2017/07/19 22:11:20]

This is not strictly necessary.  It does, however, reduce the amount of data we
need to store for each trace event.

+  event->End(strdup(name.ToCString()));
+  event->set_owns_label(true);
+  event->SetNumArguments(1);
+  event->CopyArgument(0, "args", args.ToCString());
+  event->Complete();
+#else
+  GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
+  GET_NON_NULL_NATIVE_ARGUMENT(Integer, start_cpu, arguments->NativeArgAt(1));
+  GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(2));
+
   const int64_t end = OS::GetCurrentMonotonicMicros();
   const int64_t end_cpu = OS::GetCurrentThreadCPUMicros();
   const int64_t duration = end - start.AsInt64Value();
   const int64_t duration_cpu = end_cpu - start_cpu.AsInt64Value();
   int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
 
   char* json = NULL;
@@ skipping 16 matching lines @@
         "\"ts\":%" Pd64 ",\"ph\":\"X\",\"dur\":%" Pd64 ",\"args\":%s}",
         name.ToCString(), category.ToCString(), tid, pid, start.AsInt64Value(),
         duration, args.ToCString());
   }
   ASSERT(json != NULL);
 
   event->Duration("", start.AsInt64Value(), end, start_cpu.AsInt64Value(),
                   end_cpu);
   // json was allocated in the zone and a copy will be stored in event.
   event->CompleteWithPreSerializedJSON(json);
-#endif
+#endif  // defined(HOST_OS_FUCHSIA)
+#endif  // !defined(PRODUCT)
   return Object::null();
 }
 
 DEFINE_NATIVE_ENTRY(Timeline_reportInstantEvent, 4) {
 #ifndef PRODUCT
   if (!FLAG_support_timeline) {
     return Object::null();
   }
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(1));
@@ skipping 25 matching lines @@
                            start.AsInt64Value(), args.ToCString());
 
   event->Instant("", start.AsInt64Value());
   // json was allocated in the zone and a copy will be stored in event.
   event->CompleteWithPreSerializedJSON(json);
 #endif
   return Object::null();
 }
 
 }  // namespace dart