Switch to a VM wide timeline recorder

runtime/vm/json_stream.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 "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
 #include "vm/metrics.h"
 #include "vm/object.h"
 #include "vm/service_event.h"
 #include "vm/service.h"
 #include "vm/timeline.h"
 #include "vm/unicode.h"
 
 
 namespace dart {
 
 DECLARE_FLAG(bool, trace_service);
 
 JSONStream::JSONStream(intptr_t buf_size)
     : open_objects_(0),
       buffer_(buf_size),
-      default_id_zone_(Isolate::Current()->object_id_ring(),
-                       ObjectIdRing::kAllocateId),
+      default_id_zone_(),
       id_zone_(&default_id_zone_),
       reply_port_(ILLEGAL_PORT),
-      seq_(Instance::Handle(Instance::null())),
+      seq_(NULL),
       method_(""),
       param_keys_(NULL),
       param_values_(NULL),
       num_params_(0) {
+  ObjectIdRing* ring = NULL;
+  Isolate* isolate = Isolate::Current();
+  if (isolate != NULL) {
+    ring = isolate->object_id_ring();
+  }
+  default_id_zone_.Init(ring, ObjectIdRing::kAllocateId);
 }
 
 
 JSONStream::~JSONStream() {
 }
 
 
 void JSONStream::Setup(Zone* zone,
                        Dart_Port reply_port,
                        const Instance& seq,
                        const String& method,
                        const Array& param_keys,
                        const Array& param_values) {
   set_reply_port(reply_port);
-  seq_ ^= seq.raw();
+  seq_ = &Instance::ZoneHandle(seq.raw());
   method_ = method.ToCString();
 
   String& string_iterator = String::Handle();
   if (param_keys.Length() > 0) {
     ASSERT(param_keys.Length() == param_values.Length());
     const char** param_keys_native =
         zone->Alloc<const char*>(param_keys.Length());
     const char** param_values_native =
         zone->Alloc<const char*>(param_keys.Length());
     for (intptr_t i = 0; i < param_keys.Length(); i++) {
@@ skipping 108 matching lines @@
 
 
 void JSONStream::PostReply() {
   Dart_Port port = reply_port();
   ASSERT(port != ILLEGAL_PORT);
   set_reply_port(ILLEGAL_PORT);  // Prevent double replies.
   int64_t process_delta_micros = 0;
   if (FLAG_trace_service) {
     process_delta_micros = OS::GetCurrentTimeMicros() - setup_time_micros_;
   }
-
-  if (seq_.IsString()) {
-    const String& str = String::Cast(seq_);
+  ASSERT(seq_ != NULL);
+  if (seq_->IsString()) {
+    const String& str = String::Cast(*seq_);
     PrintProperty("id", str.ToCString());
-  } else if (seq_.IsInteger()) {
-    const Integer& integer = Integer::Cast(seq_);
+  } else if (seq_->IsInteger()) {
+    const Integer& integer = Integer::Cast(*seq_);
     PrintProperty64("id", integer.AsInt64Value());
-  } else if (seq_.IsDouble()) {
-    const Double& dbl = Double::Cast(seq_);
+  } else if (seq_->IsDouble()) {
+    const Double& dbl = Double::Cast(*seq_);
     PrintProperty("id", dbl.value());
-  } else if (seq_.IsNull()) {
+  } else if (seq_->IsNull()) {
     // JSON-RPC 2.0 says that a request with a null ID shouldn't get a reply.
     PostNullReply(port);
     return;
   }
   buffer_.AddChar('}');
 
   const String& reply = String::Handle(String::New(ToCString()));
   ASSERT(!reply.IsNull());
 
   uint8_t* data = NULL;
@@ skipping 524 matching lines @@
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 }  // namespace dart