Introduce library ids and info in the wire protocol

tools/ddbg.dart

 // 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.
 
 // Simple interactive debugger shell that connects to the Dart VM's debugger
 // connection port.
 
 #import("dart:io");
 #import("dart:json");
 
@@ skipping 15 matching lines @@
 
 void printHelp() {
   print("""
   q   Quit debugger shell
   bt  Show backtrace
   r   Resume execution
   s   Single step
   so  Step over
   si  Step into
   sbp [<file>] <line> Set breakpoint
+  rbp <id> Remove breakpoint with given id
   po <id> Print object info for given id
   pc <id> Print class info for given id
   ll  List loaded libraries
+  pl <id> Print dlibrary info for given id
   ls <libname> List loaded scripts in library
   h   Print help
 """);
 }
 
 
 void quitShell() {
   vmStream.close();
   vmSock.close();
   stdin.close();
@@ skipping 22 matching lines @@
   var simple_commands =
       { 'r':'resume', 's':'stepOver', 'si':'stepInto', 'so':'stepOut'};
   if (simple_commands[command] != null) {
     var cmd = { "id": seqNum, "command": simple_commands[command]};
     sendCmd(cmd).then((result) => handleGenericResponse(result));
     stackTrace = curFrame = null;
   } else if (command == "bt") {
     var cmd = { "id": seqNum, "command": "getStackTrace" };
     sendCmd(cmd).then((result) => handleStackTraceResponse(result));
   } else if (command == "ll") {
-    var cmd = { "id": seqNum, "command": "getLibraryURLs" };
+    var cmd = { "id": seqNum, "command": "getLibraries" };
     sendCmd(cmd).then((result) => handleGetLibraryResponse(result));
   } else if (command == "sbp" && args.length >= 2) {
     var url, line;
     if (args.length == 2) {
       url = stackTrace[0]["location"]["url"];
       line = Math.parseInt(args[1]);
     } else {
       url = args[1];
       line = Math.parseInt(args[2]);
     }
     var cmd = { "id": seqNum,
                 "command": "setBreakpoint",
                 "params": { "url": url, "line": line }};
     sendCmd(cmd).then((result) => handleSetBpResponse(result));
+  } else if (command == "rbp" && args.length == 2) {
+    var cmd = { "id": seqNum,
+                "command": "removeBreakpoint",
+                "params": { "breakpointId": Math.parseInt(args[1]) }};
+    sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "ls" && args.length == 2) {
     var cmd = { "id": seqNum,
-                 "command": "getScriptURLs",
-                "params": { "library": args[1] }};
+                "command": "getScriptURLs",
+                "params": { "libraryId": Math.parseInt(args[1]) }};
     sendCmd(cmd).then((result) => handleGetScriptsResponse(result));
   } else if (command == "po" && args.length == 2) {
     var cmd = { "id": seqNum, "command": "getObjectProperties",
                 "params": {"objectId": Math.parseInt(args[1]) }};
     sendCmd(cmd).then((result) => handleGetObjPropsResponse(result));
   } else if (command == "pc" && args.length == 2) {
     var cmd = { "id": seqNum, "command": "getClassProperties",
                 "params": {"classId": Math.parseInt(args[1]) }};
     sendCmd(cmd).then((result) => handleGetClassPropsResponse(result));
+  } else if (command == "pl" && args.length == 2) {
+    var cmd = { "id": seqNum, "command": "getLibraryProperties",
+                "params": {"libraryId": Math.parseInt(args[1]) }};
+    sendCmd(cmd).then((result) => handleGetLibraryPropsResponse(result));
   } else if (command == "q") {
     quitShell();
   } else if (command == "h") {
     printHelp();
   } else {
     print("command '$command' not understood, try h for help");
   }
 }
 
 
 printNamedObject(obj) {
   var name = obj["name"];
   var value = obj["value"];
   var kind = value["kind"];
   var text = value["text"];
   var id = value["objectId"];
   if (kind == "string") {
     print("  $name = '$text'");
   } else if (kind == "object") {
     print("  $name (id:$id) = $text");
   } else {
     print("  $name = $text");
   }
 }
 
 
 handleGetObjPropsResponse(response) {
   Map props = response["result"];
   int class_id = props["classId"];
+  if (class_id == -1) {
+    print("  null");
+    return;
+  }
   List fields = props["fields"];
   print("  class id: $class_id");
   for (int i = 0; i < fields.length; i++) {
     printNamedObject(fields[i]);
   }
 }
 
 
 handleGetClassPropsResponse(response) {
   Map props = response["result"];
   assert(props["name"] != null);
   int libId = props["libraryId"];
   assert(libId != null);
   print("  class ${props["name"]} (library id: $libId)");
   List fields = props["fields"];
   if (fields.length > 0) {
     print("  static fields:");
     for (int i = 0; i < fields.length; i++) {
       printNamedObject(fields[i]);
     }
   }
 }
 
 
+handleGetLibraryPropsResponse(response) {
+  Map props = response["result"];
+  assert(props["url"] != null);
+  print("  library url=${props["url"]}");
+  List imports = props["imports"];
+  assert(imports != null);
+  if (imports.length > 0) {
+    print("  imports:");
+    for (int i = 0; i < imports.length; i++) {
+      print("    id ${imports[i]["libraryId"]} prefix ${imports[i]["prefix"]}");
+    }
+  }
+  List globals = props["globals"];
+  assert(globals != null);
+  if (globals.length > 0) {
+    print("  global variables:");
+    for (int i = 0; i < globals.length; i++) {
+      printNamedObject(globals[i]);
+    }
+  }
+}
+
+
 void handleGetLibraryResponse(response) {
   Map result = response["result"];
-  List urls = result["urls"];
+  List libs = result["libraries"];
   print("Loaded libraries:");
-  for (int i = 0; i < urls.length; i++) {
-    print("  $i ${urls[i]}");
+  print(libs);
+  for (int i = 0; i < libs.length; i++) {
+    print("  ${libs[i]["id"]} ${libs[i]["url"]}");
   }
 }
 
 
 void handleGetScriptsResponse(response) {
   Map result = response["result"];
   List urls = result["urls"];
   print("Loaded scripts:");
   for (int i = 0; i < urls.length; i++) {
     print("  $i ${urls[i]}");
@@ skipping 129 matching lines @@
   };
   vmInStream.onError = (err) {
     print("Error in debug connection: $err");
     quitShell();
   };
   vmInStream.onClosed = () {
     print("VM debugger connection closed");
     quitShell();
   };
 }