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

Unified Diff: runtime/vm/isolate.cc

Issue 3006883002: Make service protocol respect isolate lifecycle (Closed)
Patch Set: Created 3 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
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 4172327255161565a66b914e5e0008df5877e423..5ad47d357d4f2ef322118e413b90b4addbd0da65 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1995,11 +1995,17 @@ void Isolate::PrintJSON(JSONStream* stream, bool ref) {
ASSERT((debugger() == NULL) || (debugger()->PauseEvent() == NULL));
ServiceEvent pause_event(this, ServiceEvent::kNone);
jsobj.AddProperty("pauseEvent", &pause_event);
- } else if (message_handler()->is_paused_on_start() ||
- message_handler()->should_pause_on_start()) {
- ASSERT((debugger() == NULL) || (debugger()->PauseEvent() == NULL));
- ServiceEvent pause_event(this, ServiceEvent::kPauseStart);
- jsobj.AddProperty("pauseEvent", &pause_event);
+ } else if (message_handler()->should_pause_on_start()) {
+ if (message_handler()->is_paused_on_start()) {
+ ASSERT((debugger() == NULL) || (debugger()->PauseEvent() == NULL));
+ ServiceEvent pause_event(this, ServiceEvent::kPauseStart);
+ jsobj.AddProperty("pauseEvent", &pause_event);
+ } else {
+ // Isolate is runnable but not paused on start.
rmacnak 2017/08/30 23:31:52 // Some service clients get confused if they see N
cbernaschina 2017/08/30 23:53:57 Done.
+ ASSERT((debugger() == NULL) || (debugger()->PauseEvent() == NULL));
+ ServiceEvent pause_event(this, ServiceEvent::kNone);
+ jsobj.AddProperty("pauseEvent", &pause_event);
+ }
} else if (message_handler()->is_paused_on_exit() &&
((debugger() == NULL) || (debugger()->PauseEvent() == NULL))) {
ServiceEvent pause_event(this, ServiceEvent::kPauseExit);

Powered by Google App Engine
This is Rietveld 408576698