Sundry service protocol cleanups before version 1.0.

runtime/vm/message.cc

 // Copyright (c) 2011, 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/message.h"
 
 #include "vm/dart_entry.h"
 #include "vm/json_stream.h"
 #include "vm/object.h"
 #include "vm/port.h"
@@ skipping 173 matching lines @@
   Isolate* isolate = Isolate::Current();
   JSONArray messages(stream);
 
   Object& msg_handler = Object::Handle(isolate);
 
   MessageQueue::Iterator it(this);
   intptr_t depth = 0;
   while (it.HasNext()) {
     Message* current = it.Next();
     JSONObject message(&messages);
-    message.AddProperty("type", "Message");
     message.AddPropertyF("name", "Isolate Message (%" Px ")", current->Id());
     message.AddPropertyF("messageObjectId", "messages/%" Px "",
                          current->Id());
     message.AddProperty("size", current->len());
-    message.AddProperty("depth", depth++);
+    message.AddProperty("index", depth++);
     message.AddProperty("_destinationPort",
         static_cast<intptr_t>(current->dest_port()));
-    message.AddProperty("priority",
+    message.AddProperty("_priority",
         Message::PriorityAsString(current->priority()));
     // TODO(johnmccutchan): Move port -> handler map out of Dart and into the
     // VM, that way we can lookup the handler without invoking Dart code.
     msg_handler = DartLibraryCalls::LookupHandler(current->dest_port());
     if (msg_handler.IsInstance() && Instance::Cast(msg_handler).IsClosure()) {
       // Grab function from closure.
       msg_handler = Closure::function(Instance::Cast(msg_handler));
     }
     if (!msg_handler.IsFunction()) {
       // No handler function.
       continue;
     }
     const Function& function = Function::Cast(msg_handler);
     const Script& script = Script::Handle(function.script());
     message.AddProperty("handlerFunction", function);
     message.AddProperty("handlerScript", script);
     message.AddProperty("handlerTokenPos", function.token_pos());
   }
 }
 
 }  // namespace dart