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 98 matching lines @@
   event->CompleteWithPreSerializedJSON(json);
 #endif
   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(Integer, s, arguments->NativeArgAt(0));
+  GET_NON_NULL_NATIVE_ARGUMENT(Integer, s_cpu, arguments->NativeArgAt(1));
+  GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(3));
+  GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(4));
+  const int64_t start = s.AsInt64Value();
+  const int64_t start_cpu = s_cpu.AsInt64Value();
   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();
+#if defined(HOST_OS_FUCHSIA)
+  event->Duration(strdup(name.ToCString()), start, end, start_cpu, end_cpu);
+  event->set_owns_label(true);
+  event->SetNumArguments(1);
+  event->CopyArgument(0, "args", args.ToCString());
+  event->Complete();
+#else

[siva, 2017/07/20 16:36:31]

Do you think we need a OS abstraction around this to avoid having Fuchsia
conditional code in this common file. It would depend on whether we are going to
have more of these Fuchsia specific stuff or it is just this one piece.

[zra, 2017/07/20 16:57:04]

There are probably going to be more pieces because we shouldn't really be doing
"CompleteWithPreSerializedJSON()" on Fuchsia. I think it would make sense to do
the refactoring in this CL, so I will take a look at that now.

+  GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(2));
+  const int64_t duration = end - start;
+  const int64_t duration_cpu = end_cpu - start_cpu;
+  const int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
-  int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
+  const int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
 
   char* json = NULL;
 
-  if ((start_cpu.AsInt64Value() != -1) && (end_cpu != -1)) {
+  if ((start_cpu != -1) && (end_cpu != -1)) {
     json = OS::SCreate(
         zone,
         "{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64
         ","
         "\"ts\":%" Pd64 ",\"ph\":\"X\",\"dur\":%" Pd64
         ","
         "\"tdur\":%" Pd64 ",\"args\":%s}",
-        name.ToCString(), category.ToCString(), tid, pid, start.AsInt64Value(),
+        name.ToCString(), category.ToCString(), tid, pid, start,
         duration, duration_cpu, args.ToCString());
   } else {
     json = OS::SCreate(
         zone,
         "{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64
         ","
         "\"ts\":%" Pd64 ",\"ph\":\"X\",\"dur\":%" Pd64 ",\"args\":%s}",
-        name.ToCString(), category.ToCString(), tid, pid, start.AsInt64Value(),
+        name.ToCString(), category.ToCString(), tid, pid, start,
         duration, args.ToCString());
   }
   ASSERT(json != NULL);
 
-  event->Duration("", start.AsInt64Value(), end, start_cpu.AsInt64Value(),
-                  end_cpu);
+  event->Duration("", start, end, start_cpu, 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