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

Unified Diff: runtime/vm/service.cc

Issue 1053713003: Do not register service isolate descendants with service (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 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 | « no previous file | runtime/vm/service_isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index 0a59f071f5621def10d86eba7b4f3cd03d58e13a..5dcb07a56ad3d7b0f0770d3cfc14f48498cb8443 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -529,7 +529,7 @@ void Service::SetEventMask(uint32_t mask) {
void Service::SendEvent(intptr_t eventFamilyId,
intptr_t eventType,
const Object& eventMessage) {
- ASSERT(!ServiceIsolate::IsServiceIsolate(Isolate::Current()));
+ ASSERT(!ServiceIsolate::IsServiceIsolateDescendant(Isolate::Current()));
if (!ServiceIsolate::IsRunning()) {
return;
}
@@ -592,7 +592,7 @@ void Service::SendEvent(intptr_t eventFamilyId,
void Service::HandleGCEvent(GCEvent* event) {
- if (ServiceIsolate::IsServiceIsolate(Isolate::Current())) {
+ if (ServiceIsolate::IsServiceIsolateDescendant(Isolate::Current())) {
return;
}
JSONStream js;
@@ -2419,7 +2419,7 @@ class ServiceIsolateVisitor : public IsolateVisitor {
void VisitIsolate(Isolate* isolate) {
if ((isolate != Dart::vm_isolate()) &&
- !ServiceIsolate::IsServiceIsolate(isolate)) {
+ !ServiceIsolate::IsServiceIsolateDescendant(isolate)) {
jsarr_->AddValue(isolate);
}
}
« no previous file with comments | « no previous file | runtime/vm/service_isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698