Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: tools/ddbg.dart

Issue 13948009: Fix issue 9744 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/object.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/ddbg.dart
===================================================================
--- tools/ddbg.dart (revision 21173)
+++ tools/ddbg.dart (working copy)
@@ -15,7 +15,8 @@
Socket vmSock;
String vmData;
-StreamSubscription<String> streamSubscription;
+var stdinSubscription;
+var vmSubscription;
int seqNum = 0;
int isolate_id = -1;
@@ -58,9 +59,9 @@
void quitShell() {
- streamSubscription.cancel();
+ vmSubscription.cancel();
vmSock.close();
- stdin.close();
+ stdinSubscription.cancel();
}
@@ -407,7 +408,7 @@
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);
@@ -569,8 +570,8 @@
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);
},
@@ -582,9 +583,9 @@
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));
});
}
« no previous file with comments | « runtime/vm/object.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698