1. Add isolate id parameter to all the debugger commands in the debugger wire protocol so that the …

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");
 #import("dart:math", prefix: "Math");
 #import("dart:utf");
 
 
 Map<int, Completer> outstandingCommands;
 
 Socket vmSock;
 String vmData;
 OutputStream vmStream;
 int seqNum = 0;
+int isolate_id = -1;
 
 bool verbose = false;
 
 // The current stack trace, while the VM is paused. It's a list
 // of activation frames.
 List stackTrace;
 
 // The current activation frame, while the VM is paused.
 Map curFrame;
 
@@ skipping 46 matching lines @@
 void processCommand(String cmdLine) {
   seqNum++;
   var args = cmdLine.split(' ');
   if (args.length == 0) {
     return;
   }
   var command = args[0];
   var simple_commands =
       { 'r':'resume', 's':'stepOver', 'si':'stepInto', 'so':'stepOut'};
   if (simple_commands[command] != null) {
-    var cmd = { "id": seqNum, "command": simple_commands[command]};
+    var cmd = { "id": seqNum,
+                "command": simple_commands[command],
+                "params": { "isolateId" : isolate_id } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
     stackTrace = curFrame = null;
   } else if (command == "bt") {
-    var cmd = { "id": seqNum, "command": "getStackTrace" };
+    var cmd = { "id": seqNum,
+                "command": "getStackTrace",
+                "params": { "isolateId" : isolate_id } };
     sendCmd(cmd).then((result) => handleStackTraceResponse(result));
   } else if (command == "ll") {
-    var cmd = { "id": seqNum, "command": "getLibraries" };
+    var cmd = { "id": seqNum,
+                "command": "getLibraries",
+                "params": { "isolateId" : isolate_id } };
     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 }};
+                "params": { "isolateId" : isolate_id,
+                            "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]) }};
+                "params": { "isolateId" : isolate_id,
+                            "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": { "libraryId": Math.parseInt(args[1]) }};
+                "params": { "isolateId" : isolate_id,
+                            "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]) }};
+    var cmd = { "id": seqNum,
+                "command": "getObjectProperties",
+                "params": { "isolateId" : isolate_id,
+                            "objectId": Math.parseInt(args[1]) } };
     sendCmd(cmd).then((result) => handleGetObjPropsResponse(result));
   } else if (command == "pl" && args.length >= 3) {
      var cmd;
      if (args.length == 3) {
-       cmd = { "id": seqNum, "command": "getListElements",
-                "params": {"objectId": Math.parseInt(args[1]),
-                            "index": Math.parseInt(args[2]) }};
+       cmd = { "id": seqNum,
+               "command": "getListElements",
+               "params": { "isolateId" : isolate_id,
+                           "objectId": Math.parseInt(args[1]),
+                           "index": Math.parseInt(args[2]) } };
     } else {
-       cmd = { "id": seqNum, "command": "getListElements",
-                "params": {"objectId": Math.parseInt(args[1]),
-                            "index": Math.parseInt(args[2]),
-                            "length": Math.parseInt(args[3]) }};
+       cmd = { "id": seqNum,
+               "command": "getListElements",
+               "params": { "isolateId" : isolate_id,
+                           "objectId": Math.parseInt(args[1]),
+                           "index": Math.parseInt(args[2]),
+                           "length": Math.parseInt(args[3]) } };
     }
     sendCmd(cmd).then((result) => handleGetListResponse(result));
   } else if (command == "pc" && args.length == 2) {
-    var cmd = { "id": seqNum, "command": "getClassProperties",
-                "params": {"classId": Math.parseInt(args[1]) }};
+    var cmd = { "id": seqNum,
+                "command": "getClassProperties",
+                "params": { "isolateId" : isolate_id,
+                            "classId": Math.parseInt(args[1]) } };
     sendCmd(cmd).then((result) => handleGetClassPropsResponse(result));
   } else if (command == "plib" && args.length == 2) {
-    var cmd = { "id": seqNum, "command": "getLibraryProperties",
-                "params": {"libraryId": Math.parseInt(args[1]) }};
+    var cmd = { "id": seqNum,
+                "command": "getLibraryProperties",
+                "params": {"isolateId" : isolate_id,
+                           "libraryId": Math.parseInt(args[1]) } };
     sendCmd(cmd).then((result) => handleGetLibraryPropsResponse(result));
   } else if (command == "slib" && args.length == 3) {
-    var cmd = { "id": seqNum, "command": "setLibraryProperties",
-                "params": {"libraryId": Math.parseInt(args[1]),
-                           "debuggingEnabled": args[2] }};
+    var cmd = { "id": seqNum,
+                "command": "setLibraryProperties",
+                "params": {"isolateId" : isolate_id,
+                           "libraryId": Math.parseInt(args[1]),
+                           "debuggingEnabled": args[2] } };
     sendCmd(cmd).then((result) => handleSetLibraryPropsResponse(result));
   } else if (command == "pg" && args.length == 2) {
-    var cmd = { "id": seqNum, "command": "getGlobalVariables",
-                "params": {"libraryId": Math.parseInt(args[1]) }};
+    var cmd = { "id": seqNum,
+                "command": "getGlobalVariables",
+                "params": { "isolateId" : isolate_id,
+                            "libraryId": Math.parseInt(args[1]) } };
     sendCmd(cmd).then((result) => handleGetGlobalVarsResponse(result));
   } else if (command == "gs" && args.length == 3) {
-    var cmd = { "id": seqNum, "command":  "getScriptSource",
-                "params": { "libraryId": Math.parseInt(args[1]),
-                            "url": args[2] }};
+    var cmd = { "id": seqNum,
+                "command":  "getScriptSource",
+                "params": { "isolateId" : isolate_id,
+                            "libraryId": Math.parseInt(args[1]),
+                            "url": args[2] } };
     sendCmd(cmd).then((result) => handleGetSourceResponse(result));
   } else if (command == "epi" && args.length == 2) {
-    var cmd = { "id": seqNum, "command":  "setPauseOnException",
-                "params": { "exceptions": args[1] }};
+    var cmd = { "id": seqNum,
+                "command":  "setPauseOnException",
+                "params": { "isolateId" : isolate_id,
+                            "exceptions": args[1] } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "i" && args.length == 2) {
-    var cmd = { "id": seqNum, "command": "interrupt",
-                "params": {"isolateId": Math.parseInt(args[1]) }};
+    var cmd = { "id": seqNum,
+                "command": "interrupt",
+                "params": { "isolateId": Math.parseInt(args[1]) } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "q") {
     quitShell();
   } else if (command == "h") {
     printHelp();
   } else {
     print("command '$command' not understood, try h for help");
   }
 }
 
@@ skipping 180 matching lines @@
 void printStackTrace(List frames) {
   for (int i = 0; i < frames.length; i++) {
     printStackFrame(i, frames[i]);
   }
 }
 
 
 void handlePausedEvent(msg) {
   assert(msg["params"] != null);
   var reason = msg["params"]["reason"];
-  var id = msg["params"]["id"];
+  isolate_id = msg["params"]["id"];
   stackTrace = msg["params"]["callFrames"];
   assert(stackTrace != null);
   assert(stackTrace.length >= 1);
   curFrame = stackTrace[0];
   if (reason == "breakpoint") {
-    print("Isolate $id paused on breakpoint");
+    print("Isolate $isolate_id paused on breakpoint");
   } else if (reason == "interrupted") {
-    print("Isolate $id paused due to an interrupt");
+    print("Isolate $isolate_id paused due to an interrupt");
   } else {
     assert(reason == "exception");
     var excObj = msg["params"]["exception"];
-    print("Isolate $id paused on exception");
+    print("Isolate $isolate_id paused on exception");
     print(remoteObject(excObj));
   }
   print("Stack trace:");
   printStackTrace(stackTrace);
 }
 
 
 void processVmMessage(String json) {
   var msg = JSON.parse(json);
   if (msg == null) {
@@ skipping 124 matching lines @@
   };
   vmInStream.onError = (err) {
     print("Error in debug connection: $err");
     quitShell();
   };
   vmInStream.onClosed = () {
     print("VM debugger connection closed");
     quitShell();
   };
 }