Debugger support to display global variables

runtime/bin/dbg_connection.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/dartutils.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 546 matching lines @@
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   ASSERT_NOT_ERROR(res);
   msg->Printf("\"callFrames\" : [ ");
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     ASSERT_NOT_ERROR(res);
     Dart_Handle func_name;
     Dart_Handle script_url;
     intptr_t line_number = 0;
+    intptr_t library_id = 0;
     res = Dart_ActivationFrameInfo(
-        frame, &func_name, &script_url, &line_number);
-
+        frame, &func_name, &script_url, &line_number, &library_id);
     ASSERT_NOT_ERROR(res);
     ASSERT(Dart_IsString(func_name));
     msg->Printf("%s{\"functionName\":", (i > 0) ? "," : "");
     FormatEncodedString(msg, func_name);
+    msg->Printf(",\"libraryId\": %d,", library_id);
 
     ASSERT(Dart_IsString(script_url));
-    msg->Printf(",\"location\": { \"url\":");
+    msg->Printf("\"location\": { \"url\":");
     FormatEncodedString(msg, script_url);
     msg->Printf(",\"lineNumber\":%d},", line_number);
 
     Dart_Handle locals = Dart_GetLocalVariables(frame);
     ASSERT_NOT_ERROR(locals);
     msg->Printf("\"locals\":");
     FormatFieldList(msg, locals);
     msg->Printf("}");
   }
   msg->Printf("]");
@@ skipping 104 matching lines @@
     SendError(msg_id, err);
     return;
   }
   msg.Printf("}");
   SendMsg(&msg);
 }
 
 
 void DebuggerConnectionHandler::HandleGetLibPropsCmd(const char* json_msg) {
   int msg_id = msgbuf_->MessageId();
-  intptr_t cls_id = msgbuf_->GetIntParam("libraryId");
+  intptr_t lib_id = msgbuf_->GetIntParam("libraryId");
   dart::TextBuffer msg(64);
   msg.Printf("{\"id\":%d, \"result\":", msg_id);
-  const char* err = FormatLibraryProps(&msg, cls_id);
+  const char* err = FormatLibraryProps(&msg, lib_id);
   if (err != NULL) {
     SendError(msg_id, err);
     return;
   }
   msg.Printf("}");
   SendMsg(&msg);
 }
 
 
+void DebuggerConnectionHandler::HandleGetGlobalsCmd(const char* json_msg) {
+  int msg_id = msgbuf_->MessageId();
+  intptr_t lib_id = msgbuf_->GetIntParam("libraryId");
+  dart::TextBuffer msg(64);
+  msg.Printf("{\"id\":%d, \"result\": { \"globals\":", msg_id);
+  Dart_Handle globals = Dart_GetGlobalVariables(lib_id);
+  ASSERT_NOT_ERROR(globals);
+  FormatFieldList(&msg, globals);
+  msg.Printf("}}");
+  SendMsg(&msg);
+}
+
+
 void DebuggerConnectionHandler::HandleUnknownMsg(const char* json_msg) {
   int msg_id = msgbuf_->MessageId();
   ASSERT(msg_id >= 0);
   SendError(msg_id, "unknown debugger command");
 }
 
 
 void DebuggerConnectionHandler::HandleMessages() {
   static JSONDebuggerCommand debugger_commands[] = {
     { "resume", HandleResumeCmd },
     { "getLibraries", HandleGetLibrariesCmd },
     { "getClassProperties", HandleGetClassPropsCmd },
     { "getLibraryProperties", HandleGetLibPropsCmd },
     { "getObjectProperties", HandleGetObjPropsCmd },
+    { "getGlobalVariables", HandleGetGlobalsCmd },
     { "getScriptURLs", HandleGetScriptURLsCmd },
     { "getScriptSource", HandleGetSourceCmd },
     { "getStackTrace", HandleGetStackTraceCmd },
     { "setBreakpoint", HandleSetBpCmd },
     { "setPauseOnException", HandlePauseOnExcCmd },
     { "removeBreakpoint", HandleRemBpCmd },
     { "stepInto", HandleStepIntoCmd },
     { "stepOut", HandleStepOutCmd },
     { "stepOver", HandleStepOverCmd },
     { NULL, NULL }
@@ skipping 156 matching lines @@
   DebuggerConnectionImpl::StartHandler(port_number);
   Dart_SetBreakpointHandler(BreakpointHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
   Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
 }
 
 
 DebuggerConnectionHandler::~DebuggerConnectionHandler() {
   CloseDbgConnection();
 }