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

Unified Diff: runtime/bin/main.cc

Issue 242493007: Register existing isolates when service isolate is started (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 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 | « no previous file | runtime/vm/service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 62fea29882eeaf1c6978a1cf3c167b6c9278b376..d1eea463fd4bf29fa597a42adad80a96f8dac818 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -941,6 +941,7 @@ void main(int argc, char** argv) {
// Start event handler.
EventHandler::Start();
+ ASSERT(Dart_CurrentIsolate() == NULL);
// Start the VM service isolate, if necessary.
if (start_vm_service) {
ASSERT(vm_service_server_port >= 0);
@@ -952,6 +953,7 @@ void main(int argc, char** argv) {
Dart_RegisterIsolateServiceRequestCallback(
"io", &ServiceRequestHandler, NULL);
}
+ ASSERT(Dart_CurrentIsolate() == NULL);
// Call CreateIsolateAndSetup which creates an isolate and loads up
// the specified application script.
« no previous file with comments | « no previous file | runtime/vm/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698