Add Service ID zones to service protocol

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/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),
+      id_zone_(&default_id_zone_),
       reply_port_(ILLEGAL_PORT),
       seq_(""),
       method_(""),
       param_keys_(NULL),
       param_values_(NULL),
       num_params_(0) {
 }
 
 
 JSONStream::~JSONStream() {
@@ skipping 244 matching lines @@
   queue->PrintJSON(this);
 }
 
 
 void JSONStream::PrintValue(Isolate* isolate, bool ref) {
   PrintCommaIfNeeded();
   isolate->PrintJSON(this, ref);
 }
 
 
+void JSONStream::PrintServiceId(const char* name, const Object& o) {
+  ASSERT(id_zone_ != NULL);
+  PrintProperty(name, id_zone_->GetServiceId(o));
+}
+
+
 void JSONStream::PrintPropertyBool(const char* name, bool b) {
   PrintPropertyName(name);
   PrintValueBool(b);
 }
 
 
 void JSONStream::PrintProperty(const char* name, intptr_t i) {
   ASSERT(Utils::IsJavascriptInt(i));
   PrintPropertyName(name);
   PrintValue(i);
@@ skipping 212 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