Fix issue 9744

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" as json;
 import "dart:utf";
 import "dart:async";
 
 
 Map<int, Completer> outstandingCommands;
 
 Socket vmSock;
 String vmData;
-StreamSubscription<String> streamSubscription;
+var stdinSubscription;
+var vmSubscription;
 int seqNum = 0;
 int isolate_id = -1;
 
 final verbose = false;
 final printMessages = false;
 
 // The current stack trace, while the VM is paused. It's a list
 // of activation frames.
 List stackTrace;
 
@@ skipping 22 matching lines @@
   gs <lib_id> <script_url> Get source text of script in library
   tok <lib_id> <script_url> Get line and token table of script in library
   epi <none|all|unhandled>  Set exception pause info
   i <id> Interrupt execution of given isolate id
   h   Print help
 """);
 }
 
 
 void quitShell() {
-  streamSubscription.cancel();
+  vmSubscription.cancel();
   vmSock.close();
-  stdin.close();
+  stdinSubscription.cancel();
 }
 
 
 Future sendCmd(Map<String, dynamic> cmd) {
   var completer = new Completer();
   int id = cmd["id"];
   outstandingCommands[id] = completer;
   if (verbose) {
     print("sending: '${json.stringify(cmd)}'");
   }
@@ skipping 326 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"];
-  isolate_id = msg["params"]["isolateId"];
+  isolate_id = msg["params"]["id"];
   stackTrace = msg["params"]["callFrames"];
   assert(stackTrace != null);
   assert(stackTrace.length >= 1);
   curFrame = stackTrace[0];
   if (reason == "breakpoint") {
     print("Isolate $isolate_id paused on breakpoint");
   } else if (reason == "interrupted") {
     print("Isolate $isolate_id paused due to an interrupt");
   } else {
     assert(reason == "exception");
@@ skipping 141 matching lines @@
     }
   }
   return 0;
 }
 
 
 void debuggerMain() {
   outstandingCommands = new Map<int, Completer>();
   Socket.connect("127.0.0.1", 5858).then((s) {
     vmSock = s;
-    Stream<String> stringStream = vmSock.transform(new StringDecoder());
-    streamSubscription = stringStream.listen(
+    var stringStream = vmSock.transform(new StringDecoder());
+    vmSubscription = stringStream.listen(
         (String data) {
           processVmData(data);
         },
         onDone: () {
           print("VM debugger connection closed");
           quitShell();
         },
         onError: (err) {
           print("Error in debug connection: $err");
           quitShell();
         });
-    stdin.transform(new StringDecoder())
-        .transform(new LineTransformer())
-        .listen((String line) => processCommand(line));
+    stdinSubscription = stdin.transform(new StringDecoder())
+                             .transform(new LineTransformer())
+                             .listen((String line) => processCommand(line));
   });
 }
 
 void main() {
   Options options = new Options();
   List<String> arguments = options.arguments;
   if (arguments.length > 0) {
     arguments = <String>['--debug', '--verbose_debug']..addAll(arguments);
     Process.start(options.executable, arguments).then((Process process) {
       process.stdin.close();
       process.exitCode.then((int exitCode) {
         print('${arguments.join(" ")} exited with $exitCode');
       });
       debuggerMain();
     });
   } else {
     debuggerMain();
   }
 }