Support wedging isolates before startup or before exit.

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 "vm/compiler.h"
 #include "vm/coverage.h"
 #include "vm/cpu.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
 #include "vm/message.h"
+#include "vm/message_handler.h"
 #include "vm/native_entry.h"
 #include "vm/native_arguments.h"
 #include "vm/object.h"
 #include "vm/object_id_ring.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/profiler.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 228 matching lines @@
     Isolate::ServiceCreateCallback();
   if (create_callback == NULL) {
     return NULL;
   }
   Isolate::SetCurrent(NULL);
   char* error = NULL;
   Isolate* isolate = reinterpret_cast<Isolate*>(
       create_callback(callback_data, &error));
   if (isolate == NULL) {
     return NULL;
   }

[turnidge, 2014/03/18 21:45:37]

Add comment here.

[Cutch, 2014/03/18 23:32:33]

Done.

+  isolate->message_handler()->set_wedge_on_start(false);
+  isolate->message_handler()->set_wedge_on_exit(false);
   Isolate::SetCurrent(isolate);
   {
     // Install the dart:vmservice library.
     StackZone zone(isolate);
     HANDLESCOPE(isolate);
     Library& library =
         Library::Handle(isolate, isolate->object_store()->root_library());
     // Isolate is empty.
     ASSERT(library.IsNull());
     // Grab embedder tag handler.
@@ skipping 83 matching lines @@
   ASSERT(!name.IsNull());
   const Array& list = Array::Handle(
       MakeServiceControlMessage(Dart_GetMainPortId(),
                                 VM_SERVICE_ISOLATE_STARTUP_MESSAGE_ID,
                                 name));
   ASSERT(!list.IsNull());
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   writer.WriteMessage(list);
   intptr_t len = writer.BytesWritten();
+  if (FLAG_trace_service) {
+    OS::Print("Isolate %s %" Pd64 " registered with service \n",
+              name.ToCString(),
+              Dart_GetMainPortId());
+  }
   return PortMap::PostMessage(
       new Message(port_, data, len, Message::kNormalPriority));
 }
 
 
 bool Service::SendIsolateShutdownMessage() {
   if (!IsRunning()) {
     return false;
   }
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   HANDLESCOPE(isolate);
+  const String& name = String::Handle(String::New(isolate->name()));
+  ASSERT(!name.IsNull());
   const Array& list = Array::Handle(
       MakeServiceControlMessage(Dart_GetMainPortId(),
                                 VM_SERVICE_ISOLATE_SHUTDOWN_MESSAGE_ID,
-                                String::Handle(String::null())));
+                                name));
   ASSERT(!list.IsNull());
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   writer.WriteMessage(list);
   intptr_t len = writer.BytesWritten();
+  if (FLAG_trace_service) {
+    OS::Print("Isolate %s %" Pd64 " deregistered with service \n",
+              name.ToCString(),
+              Dart_GetMainPortId());
+  }
   return PortMap::PostMessage(
       new Message(port_, data, len, Message::kNormalPriority));
 }
 
 
 bool Service::IsRunning() {
   return port_ != ILLEGAL_PORT;
 }
 
 
@@ skipping 1007 matching lines @@
   }
   if (js->num_arguments() != 1) {
     PrintError(js, "Command too long");
     return true;
   }
   isolate->class_table()->AllocationProfilePrintToJSONStream(js);
   return true;
 }
 
 
 static bool HandleUnpin(Isolate* isolate, JSONStream* js) {

[turnidge, 2014/03/18 21:45:37]

Can we call this resume instead of unpin?  That way I can reuse it eventually
for the debugger.

[Cutch, 2014/03/18 23:32:33]

Done.

   // TODO(johnmccutchan): What do I respond with??
-  isolate->ClosePinPort();
+  if (isolate->message_handler()->wedge_on_start()) {
+    isolate->message_handler()->set_wedge_on_start(false);
+    return true;
+  }
+  if (isolate->message_handler()->wedge_on_exit()) {
+    isolate->message_handler()->set_wedge_on_exit(false);
+    return true;
+  }
   return true;
 }
 
 
 static bool HandleHeapMap(Isolate* isolate, JSONStream* js) {
   isolate->heap()->PrintHeapMapToJSONStream(js);
   return true;
 }
 
 
@@ skipping 225 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart