Do not register service isolate descendants with service

runtime/vm/service.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 512 matching lines @@
 
 void Service::SetEventMask(uint32_t mask) {
   event_mask_ = mask;
 }
 
 
 void Service::SendEvent(intptr_t eventFamilyId,
                         intptr_t eventType,
                         const Object& eventMessage) {
   ASSERT(!ServiceIsolate::IsServiceIsolate(Isolate::Current()));
+  if (ServiceIsolate::IsServiceIsolateDescendant(Isolate::Current())) {

[turnidge, 2015/04/01 19:57:34]

Make this an assert.  Collapse to single test.

[Cutch, 2015/04/01 20:19:04]

Done.

+    return;
+  }
   if (!ServiceIsolate::IsRunning()) {
     return;
   }
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   HANDLESCOPE(isolate);
 
   // Construct a list of the form [eventFamilyId, eventMessage].
   //
   // TODO(turnidge): Revisit passing the eventFamilyId here at all.
@@ skipping 42 matching lines @@
     memmove(message.DataAddr(offset), data, size);
     offset += size;
   }
   ASSERT(offset == total_bytes);
   // TODO(turnidge): Pass the real eventType here.
   SendEvent(eventFamilyId, 0, message);
 }
 
 
 void Service::HandleGCEvent(GCEvent* event) {
-  if (ServiceIsolate::IsServiceIsolate(Isolate::Current())) {
+  if (ServiceIsolate::IsServiceIsolate(Isolate::Current()) ||
+      ServiceIsolate::IsServiceIsolateDescendant(Isolate::Current())) {

[turnidge, 2015/04/01 19:57:34]

Collapse to one test.

[Cutch, 2015/04/01 20:19:04]

Done.

     return;
   }
   JSONStream js;
   event->PrintJSON(&js);
   const String& message = String::Handle(String::New(js.ToCString()));
   // TODO(turnidge): Pass the real eventType here.
   SendEvent(kEventFamilyGC, 0, message);
 }
 
 
@@ skipping 1806 matching lines @@
 class ServiceIsolateVisitor : public IsolateVisitor {
  public:
   explicit ServiceIsolateVisitor(JSONArray* jsarr)
       : jsarr_(jsarr) {
   }
 
   virtual ~ServiceIsolateVisitor() {}
 
   void VisitIsolate(Isolate* isolate) {
     if ((isolate != Dart::vm_isolate()) &&
-        !ServiceIsolate::IsServiceIsolate(isolate)) {
+        !ServiceIsolate::IsServiceIsolate(isolate) &&
+        !ServiceIsolate::IsServiceIsolateDescendant(isolate)) {

[turnidge, 2015/04/01 19:57:34]

Collapse test.

[Cutch, 2015/04/01 20:19:04]

Done.

       jsarr_->AddValue(isolate);
     }
   }
 
  private:
   JSONArray* jsarr_;
 };
 
 
 static const MethodParameter* get_vm_params[] = {
@@ skipping 178 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart