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

Unified Diff: runtime/bin/vmservice/client/lib/src/service/service.dart

Issue 206213004: Add a VM page to the observatory. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 9 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/bin/vmservice/client/lib/src/service/object.dart ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/vmservice/client/lib/src/service/service.dart
diff --git a/runtime/bin/vmservice/client/lib/src/service/service.dart b/runtime/bin/vmservice/client/lib/src/service/service.dart
index bc160d88a9f93715a6ada0beb860f5d3c078ca95..78c105dced1d6af9e80609a2492f3fc15e496fe3 100644
--- a/runtime/bin/vmservice/client/lib/src/service/service.dart
+++ b/runtime/bin/vmservice/client/lib/src/service/service.dart
@@ -54,10 +54,12 @@ ServiceObject _upgradeToServiceObject(VM vm, Isolate isolate, ObservableMap m) {
var type = ServiceObject.stripRef(m['type']);
switch (type) {
case 'Error':
- return new ServiceError.fromMap(isolate, m);
- case 'IsolateList':
- vm.isolates.update(m);
- return vm.isolates;
+ if (isolate != null) {
+ return new ServiceError.fromMap(isolate, m);
+ } else {
+ return new ServiceError.fromMap(vm, m);
+ }
+ break;
case 'Script':
return isolate.scripts.putIfAbsent(m);
case 'Code':
@@ -68,6 +70,8 @@ ServiceObject _upgradeToServiceObject(VM vm, Isolate isolate, ObservableMap m) {
return isolate.classes.putIfAbsent(m);
case 'Function':
return isolate.functions.putIfAbsent(m);
+ case 'VM':
+ return vm.update(m);
}
return new ServiceMap.fromMap(isolate, m);
}
« no previous file with comments | « runtime/bin/vmservice/client/lib/src/service/object.dart ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698