Include 'fixedId' key when printing service ids

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"
@@ skipping 339 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) {
+void JSONStream::PrintServiceId(const Object& o) {
   ASSERT(id_zone_ != NULL);
-  PrintProperty(name, id_zone_->GetServiceId(o));
+  PrintProperty("id", 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) {
@@ skipping 178 matching lines @@
   }
   return did_truncate;
 }
 
 
 JSONObject::JSONObject(const JSONArray* arr) : stream_(arr->stream_) {
   stream_->OpenObject();
 }
 
 
+void JSONObject::AddFixedServiceId(const char* format, ...) const {
+  // Mark that this id is fixed.
+  AddProperty("fixedId", true);
+  // Add the id property.
+  stream_->PrintPropertyName("id");
+  va_list args;
+  va_start(args, format);
+  intptr_t len = OS::VSNPrint(NULL, 0, format, args);
+  va_end(args);
+  char* p = reinterpret_cast<char*>(malloc(len+1));
+  va_start(args, format);
+  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);
+}
+
+
 void JSONObject::AddPropertyF(const char* name,
                               const char* format, ...) const {
   stream_->PrintPropertyName(name);
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
@@ skipping 17 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