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

Unified Diff: runtime/vm/service_event.cc

Issue 3006883002: Make service protocol respect isolate lifecycle (Closed)
Patch Set: Merged with upstream 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
« no previous file with comments | « runtime/vm/message_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service_event.cc
diff --git a/runtime/vm/service_event.cc b/runtime/vm/service_event.cc
index 605253539bc955d595902c3944b026dda8f710b7..71055283e94461a69602c7260e8aafd3ad2dcb80 100644
--- a/runtime/vm/service_event.cc
+++ b/runtime/vm/service_event.cc
@@ -36,17 +36,13 @@ ServiceEvent::ServiceEvent(Isolate* isolate, EventKind event_kind)
ASSERT(isolate == NULL ||
!ServiceIsolate::IsServiceIsolateDescendant(isolate_));
- if ((event_kind == ServiceEvent::kPauseStart) &&
- !isolate->message_handler()->is_paused_on_start()) {
- // We will pause on start but the message handler lacks a valid
- // paused timestamp because we haven't paused yet. Use the current time.
- timestamp_ = OS::GetCurrentTimeMillis();
- } else if ((event_kind == ServiceEvent::kPauseStart) ||
- (event_kind == ServiceEvent::kPauseExit)) {
+ if ((event_kind == ServiceEvent::kPauseStart) ||
+ (event_kind == ServiceEvent::kPauseExit)) {
timestamp_ = isolate->message_handler()->paused_timestamp();
} else if (event_kind == ServiceEvent::kResume) {
timestamp_ = isolate->last_resume_timestamp();
}
+ ASSERT(timestamp_ > -1);
}
void ServiceEvent::UpdateTimestamp() {
« no previous file with comments | « runtime/vm/message_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698