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

Unified Diff: runtime/bin/dbg_message.cc

Issue 1279733003: Clean VM thread shutdown: (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Merge Created 5 years, 4 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/dartutils.cc ('k') | runtime/bin/gen_snapshot.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/dbg_message.cc
diff --git a/runtime/bin/dbg_message.cc b/runtime/bin/dbg_message.cc
index a6358806daca30d265fda87d03c6b66a7fc05656..0a3038a619d198038fcac8f9d59b14910c383997 100644
--- a/runtime/bin/dbg_message.cc
+++ b/runtime/bin/dbg_message.cc
@@ -1402,14 +1402,17 @@ void DbgMsgQueueList::ExceptionThrownHandler(Dart_IsolateId isolate_id,
void DbgMsgQueueList::IsolateEventHandler(Dart_IsolateId isolate_id,
Dart_IsolateEvent kind) {
- DebuggerConnectionHandler::WaitForConnection();
- Dart_EnterScope();
if (kind == kCreated) {
+ DebuggerConnectionHandler::WaitForConnection();
+ Dart_EnterScope();
DbgMsgQueue* msg_queue = AddIsolateMsgQueue(isolate_id);
msg_queue->SendIsolateEvent(isolate_id, kind);
+ Dart_ExitScope();
} else {
DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
if (msg_queue != NULL) {
+ DebuggerConnectionHandler::WaitForConnection();
+ Dart_EnterScope();
msg_queue->SendQueuedMsgs();
msg_queue->SendIsolateEvent(isolate_id, kind);
if (kind == kInterrupted) {
@@ -1418,9 +1421,11 @@ void DbgMsgQueueList::IsolateEventHandler(Dart_IsolateId isolate_id,
ASSERT(kind == kShutdown);
RemoveIsolateMsgQueue(isolate_id);
}
+ Dart_ExitScope();
}
+ // If there is no receive message queue, do not wait for a connection, and
+ // ignore the message.
}
- Dart_ExitScope();
}
} // namespace bin
« no previous file with comments | « runtime/bin/dartutils.cc ('k') | runtime/bin/gen_snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698