Complete the switch to ServiceObject

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 "vm/compiler.h"
 #include "vm/coverage.h"
@@ skipping 465 matching lines @@
 
 struct RootMessageHandlerEntry {
   const char* command;
   RootMessageHandler handler;
 };
 
 static RootMessageHandler FindRootMessageHandler(const char* command);
 
 
 static void PrintArgumentsAndOptions(const JSONObject& obj, JSONStream* js) {
-  JSONObject jsobj(&obj, "message");
+  JSONObject jsobj(&obj, "request");
   {
     JSONArray jsarr(&jsobj, "arguments");
     for (intptr_t i = 0; i < js->num_arguments(); i++) {
       jsarr.AddValue(js->GetArgument(i));
     }
   }
   {
     JSONArray jsarr(&jsobj, "option_keys");
     for (intptr_t i = 0; i < js->num_options(); i++) {
       jsarr.AddValue(js->GetOptionKey(i));
     }
   }
   {
     JSONArray jsarr(&jsobj, "option_values");
     for (intptr_t i = 0; i < js->num_options(); i++) {
       jsarr.AddValue(js->GetOptionValue(i));
     }
   }
 }
 
 
-static void PrintError(JSONStream* js, const char* format, ...) {
+static void PrintError(JSONStream* js,
+                       const char* format, ...) {
   Isolate* isolate = Isolate::Current();
 
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
 
   char* buffer = isolate->current_zone()->Alloc<char>(len + 1);
   va_list args2;
   va_start(args2, format);
   OS::VSNPrint(buffer, (len + 1), format, args2);
   va_end(args2);
 
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Error");
-  jsobj.AddProperty("text", buffer);
+  jsobj.AddProperty("id", "");

[turnidge, 2014/03/10 21:03:28]

Do we require an empty id now for Errors?  Why?

[Cutch, 2014/03/11 03:17:48]

We detect that a JSON map is a ServiceObject by checking for a type and an id. 

Longer term, the client side should canonicalize errors and never "reload" one.

+  jsobj.AddProperty("message", buffer);
   PrintArgumentsAndOptions(jsobj, js);
 }
 
+
+static void PrintErrorWithKind(JSONStream* js,
+                               const char* kind,
+                               const char* format, ...) {
+  Isolate* isolate = Isolate::Current();
+
+  va_list args;
+  va_start(args, format);
+  intptr_t len = OS::VSNPrint(NULL, 0, format, args);
+  va_end(args);
+
+  char* buffer = isolate->current_zone()->Alloc<char>(len + 1);
+  va_list args2;
+  va_start(args2, format);
+  OS::VSNPrint(buffer, (len + 1), format, args2);
+  va_end(args2);
+
+  JSONObject jsobj(js);
+  jsobj.AddProperty("type", "Error");
+  jsobj.AddProperty("id", "");
+  jsobj.AddProperty("kind", kind);
+  jsobj.AddProperty("message", buffer);
+  PrintArgumentsAndOptions(jsobj, js);
+}
+
 
 void Service::HandleIsolateMessage(Isolate* isolate, const Instance& msg) {
   ASSERT(isolate != NULL);
   ASSERT(!msg.IsNull());
   ASSERT(msg.IsGrowableObjectArray());
 
   {
     StackZone zone(isolate);
     HANDLESCOPE(isolate);
 
@@ skipping 59 matching lines @@
 
 
 static bool HandleStackTrace(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() > 1) {
     PrintError(js, "Command too long");
     return true;
   }
   DebuggerStackTrace* stack = isolate->debugger()->StackTrace();
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "StackTrace");
+  jsobj.AddProperty("id", "stacktrace");
   JSONArray jsarr(&jsobj, "members");
   intptr_t num_frames = stack->Length();
   for (intptr_t i = 0; i < num_frames; i++) {
     ActivationFrame* frame = stack->FrameAt(i);
     JSONObject jsobj(&jsarr);
     frame->PrintToJSONObject(&jsobj);
     // TODO(turnidge): Implement depth differently -- differentiate
     // inlined frames.
     jsobj.AddProperty("depth", i);
   }
@@ skipping 388 matching lines @@
     for (intptr_t i = 0; i < num_scripts; i++) {
       script ^= loaded_scripts.At(i);
       ASSERT(!script.IsNull());
       url ^= script.url();
       if (url.Equals(requested_url)) {
         script.PrintToJSONStream(js, false);
         return true;
       }
     }
   }
-  PrintError(js, "Cannot find script %s\n", requested_url.ToCString());
+  PrintErrorWithKind(js, "NotFoundError", "Cannot find script %s",
+                     requested_url.ToCString());
   return true;
 }
 
 
 static bool HandleScripts(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     // Enumerate all scripts.
     return HandleScriptsEnumerate(isolate, js);
   } else if (js->num_arguments() == 2) {
     // Fetch specific script.
@@ skipping 370 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart