More timeline cleanups

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"
 #include "vm/os.h"
 #include "vm/timeline.h"
 
 namespace dart {
 
 // Native implementations for the dart:developer library.
-DEFINE_NATIVE_ENTRY(Timeline_getTraceClock, 0) {
-  return Integer::New(OS::GetCurrentTraceMicros(), Heap::kNew, true);
+
+DEFINE_NATIVE_ENTRY(Timeline_getIsolateNum, 0) {
+  return Integer::New(static_cast<int64_t>(isolate->main_port()),
+                      Heap::kOld,
+                      true);
 }
 
 
 DEFINE_NATIVE_ENTRY(Timeline_getNextAsyncId, 0) {
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Integer::New(0);
   }
   return Integer::New(recorder->GetNextAsyncId());
 }
 
 
+DEFINE_NATIVE_ENTRY(Timeline_getTraceClock, 0) {
+  return Integer::New(OS::GetCurrentTraceMicros(), Heap::kNew, true);
+}
+
+
 DEFINE_NATIVE_ENTRY(Timeline_reportTaskEvent, 6) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, id, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(String, phase, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(3));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(4));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(5));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
-
   int64_t pid = OS::ProcessId();
   int64_t tid = OSThread::ThreadIdToIntPtr(OSThread::GetCurrentThreadTraceId());
 
-  char* event = OS::SCreate(zone,
+  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(),
       id.AsInt64Value(),
       args.ToCString());
 
-  // event was allocated in the zone and will be copied by AppendDartEvent.
-  recorder->AppendDartEvent(isolate, event);
+  TimelineEvent* event = isolate->GetDartStream()->StartEvent();
+  if (event == NULL) {
+    // Stream was turned off.
+    return Object::null();
+  }
+  // json was allocated in the zone and a copy will be stored in event.
+  event->SerializedJSON(json);
+  event->Complete();
 
   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));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(4));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
   int64_t duration = end.AsInt64Value() - start.AsInt64Value();
   int64_t pid = OS::ProcessId();
   int64_t tid = OSThread::ThreadIdToIntPtr(OSThread::GetCurrentThreadTraceId());
 
-  char* event = OS::SCreate(zone,
+  char* 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(),
       duration,
       args.ToCString());
 
-  // event was allocated in the zone and will be copied by AppendDartEvent.
-  recorder->AppendDartEvent(isolate, event);
+  TimelineEvent* event = isolate->GetDartStream()->StartEvent();
+  if (event == NULL) {
+    // Stream was turned off.
+    return Object::null();
+  }
+  // json was allocated in the zone and a copy will be stored in event.
+  event->SerializedJSON(json);
+  event->Complete();
 
   return Object::null();
 }
 
 }  // namespace dart