Support wedging isolates before startup or before exit.

runtime/vm/isolate.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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "lib/mirrors.h"
@@ skipping 23 matching lines @@
 #include "vm/timer.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 DEFINE_FLAG(bool, report_usage_count, false,
             "Track function usage and report.");
 DEFINE_FLAG(bool, trace_isolates, false,
             "Trace isolate creation and shut down.");
-DEFINE_FLAG(bool, pin_isolates, false,
-            "Stop isolates from being destroyed automatically.");
+DEFINE_FLAG(bool, pause_isolates_on_start, false,
+            "Pause isolates before starting.");
+DEFINE_FLAG(bool, pause_isolates_on_exit, false,
+            "Pause isolates exiting.");
 
 
 void Isolate::RegisterClass(const Class& cls) {
   class_table()->Register(cls);
 }
 
 
 void Isolate::RegisterClassAt(intptr_t index, const Class& cls) {
   class_table()->RegisterAt(index, cls);
 }
@@ skipping 236 matching lines @@
 #endif  // defined(DEBUG)
 
 #define REUSABLE_HANDLE_INITIALIZERS(object)                                   \
   object##_handle_(NULL),
 
 Isolate::Isolate()
     : store_buffer_(),
       message_notify_callback_(NULL),
       name_(NULL),
       start_time_(OS::GetCurrentTimeMicros()),
-      pin_port_(0),
       main_port_(0),
       heap_(NULL),
       object_store_(NULL),
       top_context_(Context::null()),
       top_exit_frame_info_(0),
       init_callback_data_(NULL),
       environment_callback_(NULL),
       library_tag_handler_(NULL),
       api_state_(NULL),
       stub_code_(NULL),
@@ skipping 116 matching lines @@
   ASSERT(state != NULL);
   result->set_api_state(state);
 
   // Initialize stack top and limit in case we are running the isolate in the
   // main thread.
   // TODO(5411455): Need to figure out how to set the stack limit for the
   // main thread.
   result->SetStackLimitFromCurrentTOS(reinterpret_cast<uword>(&result));
   result->set_main_port(PortMap::CreatePort(result->message_handler()));
   result->BuildName(name_prefix);
-  if (FLAG_pin_isolates) {
-    result->CreatePinPort();
-  }
+  result->message_handler()->set_pause_on_start(FLAG_pause_isolates_on_start);
+  result->message_handler()->set_pause_on_exit(FLAG_pause_isolates_on_exit);
 
   result->debugger_ = new Debugger();
   result->debugger_->Initialize(result);
   if (FLAG_trace_isolates) {
     if (name_prefix == NULL || strcmp(name_prefix, "vm-isolate") != 0) {
       OS::Print("[+] Starting isolate:\n"
                 "\tisolate:    %s\n", result->name());
     }
   }
 
 
   return result;
 }
 
 
-void Isolate::CreatePinPort() {
-  ASSERT(FLAG_pin_isolates);
-  // Only do this once.
-  ASSERT(pin_port_ == 0);
-  pin_port_ = PortMap::CreatePort(message_handler());
-  ASSERT(pin_port_ != 0);
-  PortMap::SetLive(pin_port_);
-}
-
-
-void Isolate::ClosePinPort() {
-  if (pin_port_ == 0) {
-    // Support multiple calls to close.
-    return;
-  }
-  ASSERT(pin_port_ != 0);
-  bool r = PortMap::ClosePort(pin_port_);
-  ASSERT(r);
-  pin_port_ = 0;
-}
-
-
 void Isolate::BuildName(const char* name_prefix) {
   ASSERT(name_ == NULL);
   if (name_prefix == NULL) {
     name_prefix = "isolate";
   }
   const char* kFormat = "%s-%lld";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, name_prefix, main_port()) + 1;
   name_ = new char[len];
   OS::SNPrint(name_, len, kFormat, name_prefix, main_port());
 }
@@ skipping 420 matching lines @@
   DebuggerStackTrace* stack = debugger()->StackTrace();
   if (stack->Length() > 0) {
     JSONObject jsframe(&jsobj, "topFrame");
 
     ActivationFrame* frame = stack->FrameAt(0);
     frame->PrintToJSONObject(&jsobj);
     // TODO(turnidge): Implement depth differently -- differentiate
     // inlined frames.
     jsobj.AddProperty("depth", (intptr_t)0);
   }
-
+  intptr_t live_ports = message_handler()->live_ports();
+  intptr_t control_ports = message_handler()->control_ports();
+  bool paused_on_exit = message_handler()->paused_on_exit();
+  bool pause_on_start = message_handler()->pause_on_start();
+  bool pause_on_exit = message_handler()->pause_on_exit();
+  jsobj.AddProperty("live_ports", live_ports);
+  jsobj.AddProperty("control_ports", control_ports);
+  jsobj.AddProperty("paused_on_exit", paused_on_exit);
+  jsobj.AddProperty("paused_on_start", pause_on_start);
+  jsobj.AddProperty("pause_on_exit", pause_on_exit);
   const Library& lib =
       Library::Handle(object_store()->root_library());
   jsobj.AddProperty("rootLib", lib);
 
   timer_list().PrintTimersToJSONProperty(&jsobj);
 }
 
 
 void Isolate::VisitIsolates(IsolateVisitor* visitor) {
   if (visitor == NULL) {
@@ skipping 157 matching lines @@
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart