Add Service ID zones to service protocol

runtime/vm/json_stream.h

 // 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.
 
 #ifndef VM_JSON_STREAM_H_
 #define VM_JSON_STREAM_H_
 
 #include "include/dart_api.h"  // for Dart_Port
 #include "platform/json.h"
 #include "vm/allocation.h"
+#include "vm/service.h"
 
 namespace dart {
 
 class Array;
 class Field;
 class GrowableObjectArray;
 class Instance;
 class JSONArray;
 class JSONObject;
 class MessageQueue;
 class Metric;
 class Object;
+class RingIdZone;
 class ServiceEvent;
+class ServiceIdZone;
 class SourceBreakpoint;
 class String;
 class Zone;
 
 class JSONStream : ValueObject {
  public:
   explicit JSONStream(intptr_t buf_size = 256);
   ~JSONStream();
 
   void Setup(Zone* zone,
              Dart_Port reply_port,
              const String& seq,
              const String& method,
              const Array& param_keys,
              const Array& param_values);
   void SetupError();
 
   void PostReply();
 
+  void set_service_id_zone(ServiceIdZone* service_id_zone) {
+    service_id_zone_ = service_id_zone;
+  }
+  ServiceIdZone* service_id_zone() {
+    return service_id_zone_;
+  }
+
   TextBuffer* buffer() { return &buffer_; }
   const char* ToCString() { return buffer_.buf(); }
 
   void set_reply_port(Dart_Port port);
 
   void SetParams(const char** param_keys, const char** param_values,
                  intptr_t num_params);
 
   Dart_Port reply_port() const { return reply_port_; }
 
@@ skipping 36 matching lines @@
   void PrintValueNoEscape(const char* s);
   void PrintfValue(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
   void PrintValue(const Object& o, bool ref = true);
   void PrintValue(SourceBreakpoint* bpt);
   void PrintValue(const ServiceEvent* event);
   void PrintValue(Metric* metric);
   void PrintValue(MessageQueue* queue);
   void PrintValue(Isolate* isolate, bool ref = true);
   bool PrintValueStr(const String& s, intptr_t limit);
 
+  void PrintServiceId(const char* name, const Object& o);
   void PrintPropertyBool(const char* name, bool b);
   void PrintProperty(const char* name, intptr_t i);
   void PrintProperty64(const char* name, int64_t i);
   void PrintProperty(const char* name, double d);
   void PrintProperty(const char* name, const char* s);
   bool PrintPropertyStr(const char* name, const String& s, intptr_t limit);
   void PrintPropertyNoEscape(const char* name, const char* s);
   void PrintfProperty(const char* name, const char* format, ...)
   PRINTF_ATTRIBUTE(3, 4);
   void PrintProperty(const char* name, const Object& o, bool ref = true);
 
   void PrintProperty(const char* name, const ServiceEvent* event);
   void PrintProperty(const char* name, SourceBreakpoint* bpt);
   void PrintProperty(const char* name, Metric* metric);
   void PrintProperty(const char* name, MessageQueue* queue);
   void PrintProperty(const char* name, Isolate* isolate);
   void PrintPropertyName(const char* name);
   void PrintCommaIfNeeded();
   bool NeedComma();
 
   bool AddDartString(const String& s, intptr_t limit);
   void AddEscapedUTF8String(const char* s);
   void AddEscapedUTF8String(const char* s, intptr_t len);
 
   intptr_t nesting_level() const { return open_objects_; }
 
   intptr_t open_objects_;
   TextBuffer buffer_;
+  // Default service id zone.
+  RingServiceIdZone ring_service_id_zone_;

[turnidge, 2015/05/11 19:48:45]

Call this default_service_id_zone?  Also, stray space before semicolon.

[turnidge, 2015/05/11 20:01:04]

Or default_id_zone.

[Cutch, 2015/05/12 14:59:56]

Done.

+  ServiceIdZone* service_id_zone_;
   Dart_Port reply_port_;
   const char* seq_;
   const char* method_;
   const char** param_keys_;
   const char** param_values_;
   intptr_t num_params_;
   int64_t setup_time_micros_;
 
   friend class JSONObject;
   friend class JSONArray;
 };
 
 
 class JSONObject : public ValueObject {
  public:
   explicit JSONObject(JSONStream* stream) : stream_(stream) {
     stream_->OpenObject();
   }
   JSONObject(const JSONObject* obj, const char* name) : stream_(obj->stream_) {
     stream_->OpenObject(name);
   }
   explicit JSONObject(const JSONArray* arr);
 
   ~JSONObject() {
     stream_->CloseObject();
   }
 
+  void AddServiceId(const char* name, const Object& o) const {
+    stream_->PrintServiceId(name, o);
+  }
+
   void AddProperty(const char* name, bool b) const {
     stream_->PrintPropertyBool(name, b);
   }
   void AddProperty(const char* name, intptr_t i) const {
     stream_->PrintProperty(name, i);
   }
   void AddProperty64(const char* name, int64_t i) const {
     stream_->PrintProperty64(name, i);
   }
   void AddProperty(const char* name, double d) const {
@@ skipping 86 matching lines @@
 
   friend class JSONObject;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(JSONArray);
 };
 
 }  // namespace dart
 
 #endif  // VM_JSON_STREAM_H_