Do not JSON encode the 'result' of a service rpc.

runtime/vm/service.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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 38 matching lines @@
 
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 static void PrintRequest(const JSONObject& obj, JSONStream* js) {
   JSONObject jsobj(&obj, "request");
   jsobj.AddProperty("method", js->method());
   {
-    JSONArray jsarr(&jsobj, "param_keys");
+    JSONObject params(&jsobj, "params");
     for (intptr_t i = 0; i < js->num_params(); i++) {
-      jsarr.AddValue(js->GetParamKey(i));
-    }
-  }
-  {
-    JSONArray jsarr(&jsobj, "param_values");
-    for (intptr_t i = 0; i < js->num_params(); i++) {
-      jsarr.AddValue(js->GetParamValue(i));
+      params.AddProperty(js->GetParamKey(i), js->GetParamValue(i));
     }
   }
 }
 
 
 static void PrintError(JSONStream* js,
                        const char* format, ...) {
   Isolate* isolate = Isolate::Current();
 
   va_list args;
@@ skipping 339 matching lines @@
       return false;
     }
   }
   return true;
 }
 
 
 void Service::InvokeMethod(Isolate* isolate, const Array& msg) {
   ASSERT(isolate != NULL);
   ASSERT(!msg.IsNull());
-  ASSERT(msg.Length() == 5);
+  ASSERT(msg.Length() == 6);
 
   {
     StackZone zone(isolate);
     HANDLESCOPE(isolate);
 
     Instance& reply_port = Instance::Handle(isolate);
+    String& seq = String::Handle(isolate);
     String& method_name = String::Handle(isolate);
     Array& param_keys = Array::Handle(isolate);
     Array& param_values = Array::Handle(isolate);
     reply_port ^= msg.At(1);
-    method_name ^= msg.At(2);
-    param_keys ^= msg.At(3);
-    param_values ^= msg.At(4);
+    seq ^= msg.At(2);
+    method_name ^= msg.At(3);
+    param_keys ^= msg.At(4);
+    param_values ^= msg.At(5);
 
     ASSERT(!method_name.IsNull());
+    ASSERT(!seq.IsNull());
     ASSERT(!param_keys.IsNull());
     ASSERT(!param_values.IsNull());
     ASSERT(param_keys.Length() == param_values.Length());
 
     if (!reply_port.IsSendPort()) {
       FATAL("SendPort expected.");
     }
 
     JSONStream js;
     js.Setup(zone.GetZone(), SendPort::Cast(reply_port).Id(),
-             method_name, param_keys, param_values);
+             seq, method_name, param_keys, param_values);
 
     const char* c_method_name = method_name.ToCString();
 
     ServiceMethodDescriptor* method = FindMethod(c_method_name);
     if (method != NULL) {
       if (!ValidateParameters(method->parameters, &js)) {
         js.PostReply();
         return;
       }
       if (method->entry(isolate, &js)) {
@@ skipping 89 matching lines @@
     NoSafepointScope no_safepoint;
     memmove(message.DataAddr(offset), data, size);
     offset += size;
   }
   ASSERT(offset == total_bytes);
   // TODO(turnidge): Pass the real eventType here.
   SendEvent(0, message);
 }
 
 
-void Service::HandleGCEvent(GCEvent* event) {
-  if (ServiceIsolate::IsServiceIsolateDescendant(Isolate::Current())) {
-    return;
-  }
-  JSONStream js;
-  event->PrintJSON(&js);
-  const String& message = String::Handle(String::New(js.ToCString()));
-  // TODO(turnidge): Pass the real eventType here.
-  SendEvent(0, message);
-}
-
-
 void Service::HandleEvent(ServiceEvent* event) {
+  if (ServiceIsolate::IsServiceIsolateDescendant(event->isolate())) {
+    return;
+  }
   JSONStream js;
-  event->PrintJSON(&js);
+  {
+    JSONObject jsobj(&js);
+    jsobj.AddProperty("event", event);
+  }
   const String& message = String::Handle(String::New(js.ToCString()));
   SendEvent(event->type(), message);
 }
 
 
 class EmbedderServiceHandler {
  public:
   explicit EmbedderServiceHandler(const char* name) : name_(NULL),
                                                       callback_(NULL),
                                                       user_data_(NULL),
@@ skipping 167 matching lines @@
     jsobj->AddProperty("text", js->LookupParam("text"));
   }
   return true;
 }
 
 
 void Service::SendEchoEvent(Isolate* isolate, const char* text) {
   JSONStream js;
   {
     JSONObject jsobj(&js);
-    jsobj.AddProperty("type", "ServiceEvent");
-    jsobj.AddProperty("eventType", "_Echo");
-    jsobj.AddProperty("isolate", isolate);
-    if (text != NULL) {
-      jsobj.AddProperty("text", text);
+    {
+      JSONObject event(&jsobj, "event");
+      event.AddProperty("type", "ServiceEvent");
+      event.AddProperty("eventType", "_Echo");
+      event.AddProperty("isolate", isolate);
+      if (text != NULL) {
+        event.AddProperty("text", text);
+      }
     }
   }
   const String& message = String::Handle(String::New(js.ToCString()));
   uint8_t data[] = {0, 128, 255};
   SendEvent(message, data, sizeof(data));
 }
 
 
 static bool _TriggerEchoEvent(Isolate* isolate, JSONStream* js) {
   Service::SendEchoEvent(isolate, js->LookupParam("text"));
@@ skipping 1415 matching lines @@
 
 
 void Service::SendGraphEvent(Isolate* isolate) {
   uint8_t* buffer = NULL;
   WriteStream stream(&buffer, &allocator, 1 * MB);
   ObjectGraph graph(isolate);
   graph.Serialize(&stream);
   JSONStream js;
   {
     JSONObject jsobj(&js);
-    jsobj.AddProperty("type", "ServiceEvent");
-    jsobj.AddProperty("eventType", "_Graph");
-    jsobj.AddProperty("isolate", isolate);
+    {
+      JSONObject event(&jsobj, "event");
+      event.AddProperty("type", "ServiceEvent");
+      event.AddProperty("eventType", "_Graph");
+      event.AddProperty("isolate", isolate);
+    }
   }
   const String& message = String::Handle(String::New(js.ToCString()));
   SendEvent(message, buffer, stream.bytes_written());
 }
 
 
 class ContainsAddressVisitor : public FindObjectVisitor {
  public:
   ContainsAddressVisitor(Isolate* isolate, uword addr)
       : FindObjectVisitor(isolate), addr_(addr) { }
@@ skipping 359 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart