Debugger wire protocol cleanups

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, 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 "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 372 matching lines @@
       buf->Printf(",");
     }
     FormatValueObj(buf, value);
   }
   buf->Printf("]}");
   return NULL;
 }
 
 
 static void FormatLocationFromTrace(dart::TextBuffer* msg,
-                                    Dart_StackTrace trace) {
+                                    Dart_StackTrace trace,
+                                    const char* prefix) {
   intptr_t trace_len = 0;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   ASSERT_NOT_ERROR(res);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   ASSERT_NOT_ERROR(res);
   Dart_Handle script_url;
   intptr_t token_number = 0;
   intptr_t line_number = 0;
   intptr_t library_id = 0;
   // TODO(hausner): Remove this call and line_number once Editor no
   // longer depends on line number info.
   res = Dart_ActivationFrameInfo(frame, NULL, NULL, &line_number, NULL);
   ASSERT_NOT_ERROR(res);
   res = Dart_ActivationFrameGetLocation(
       frame, &script_url, &library_id, &token_number);
   ASSERT_NOT_ERROR(res);
   if (!Dart_IsNull(script_url)) {
     ASSERT(Dart_IsString(script_url));
-    msg->Printf("\"location\": { \"url\":");
+    msg->Printf("%s\"location\": { \"url\":", prefix);
     FormatEncodedString(msg, script_url);
     msg->Printf(",\"libraryId\":%"Pd",", library_id);
     msg->Printf("\"tokenOffset\":%"Pd",", token_number);
-    msg->Printf("\"lineNumber\":%"Pd"},", line_number);
+    msg->Printf("\"lineNumber\":%"Pd"}", line_number);
   }
 }
 
 
 static void FormatCallFrames(dart::TextBuffer* msg, Dart_StackTrace trace) {
   intptr_t trace_len = 0;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   ASSERT_NOT_ERROR(res);
   msg->Printf("\"callFrames\" : [ ");
   for (int i = 0; i < trace_len; i++) {
@@ skipping 572 matching lines @@
   }
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the paused event in the wire protocol.
 void DbgMsgQueue::SendBreakpointEvent(Dart_StackTrace trace) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
   msg.Printf("\"reason\": \"breakpoint\", ");
-  msg.Printf("\"id\": %"Pd64", ", isolate_id_);
-  FormatLocationFromTrace(&msg, trace);
-  FormatCallFrames(&msg, trace);
+  msg.Printf("\"isolateId\": %"Pd64"", isolate_id_);
+  FormatLocationFromTrace(&msg, trace, ", ");
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the paused event in the wire protocol.
 void DbgMsgQueue::SendExceptionEvent(Dart_Handle exception,
                                      Dart_StackTrace stack_trace) {
   intptr_t exception_id = Dart_CacheObject(exception);
   ASSERT(exception_id >= 0);
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": {");
   msg.Printf("\"reason\": \"exception\", ");
-  msg.Printf("\"id\": %"Pd64", ", isolate_id_);
+  msg.Printf("\"isolateId\": %"Pd64", ", isolate_id_);
   msg.Printf("\"exception\":");
   FormatRemoteObj(&msg, exception);
-  msg.Printf(", ");
-  FormatLocationFromTrace(&msg, stack_trace);
-  FormatCallFrames(&msg, stack_trace);
+  FormatLocationFromTrace(&msg, stack_trace, ", ");
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the interrupted event in the wire protocol.
 void DbgMsgQueue::SendIsolateEvent(Dart_IsolateId isolate_id,
                                    Dart_IsolateEvent kind) {
   dart::TextBuffer msg(128);
   if (kind == kInterrupted) {
     Dart_StackTrace trace;
     Dart_Handle res = Dart_GetStackTrace(&trace);
     ASSERT_NOT_ERROR(res);
     msg.Printf("{ \"event\": \"paused\", \"params\": { ");
     msg.Printf("\"reason\": \"interrupted\", ");
-    msg.Printf("\"id\": %"Pd64", ", isolate_id);
-    FormatLocationFromTrace(&msg, trace);
-    FormatCallFrames(&msg, trace);
+    msg.Printf("\"isolateId\": %"Pd64"", isolate_id);
+    FormatLocationFromTrace(&msg, trace, ", ");
     msg.Printf("}}");
   } else {
     msg.Printf("{ \"event\": \"isolate\", \"params\": { ");
     if (kind == kCreated) {
       msg.Printf("\"reason\": \"created\", ");
     } else {
       ASSERT(kind == kShutdown);
       msg.Printf("\"reason\": \"shutdown\", ");
     }
     msg.Printf("\"id\": %"Pd64" ", isolate_id);
@@ skipping 174 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }