From a580bafc5de1ff9a66d642fa92f5eb85fb2f1a31 Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Wed, 16 Sep 2015 15:51:10 -0700 Subject: [PATCH] Disable shutdown BUG= Review URL: https://codereview.chromium.org//1350713004 . --- runtime/bin/process.cc | 2 +- runtime/vm/dart.cc | 2 +- runtime/vm/service_isolate.cc | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/runtime/bin/process.cc b/runtime/bin/process.cc index 3c345b724ca..9e3e14e7ae5 100644 --- a/runtime/bin/process.cc +++ b/runtime/bin/process.cc @@ -19,7 +19,7 @@ namespace bin { // Global flag that is used to indicate that the VM should do a clean // shutdown. -bool do_vm_shutdown = true; +bool do_vm_shutdown = false; static const int kProcessIdNativeField = 0; diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc index ffd6a705178..41b04de36db 100644 --- a/runtime/vm/dart.cc +++ b/runtime/vm/dart.cc @@ -38,7 +38,7 @@ DECLARE_FLAG(bool, trace_isolates); DECLARE_FLAG(bool, trace_time_all); DEFINE_FLAG(bool, keep_code, false, "Keep deoptimized code for profiling."); -DEFINE_FLAG(bool, shutdown, true, "Do a clean shutdown of the VM"); +DEFINE_FLAG(bool, shutdown, false, "Do a clean shutdown of the VM"); Isolate* Dart::vm_isolate_ = NULL; ThreadPool* Dart::thread_pool_ = NULL; diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc index 29a71ceb249..39e457c8920 100644 --- a/runtime/vm/service_isolate.cc +++ b/runtime/vm/service_isolate.cc @@ -22,6 +22,8 @@ namespace dart { +DECLARE_FLAG(bool, shutdown); + #define Z (T->zone()) @@ -763,6 +765,9 @@ void ServiceIsolate::Run() { void ServiceIsolate::KillServiceIsolate() { + if (!FLAG_shutdown) { + return; + } { MonitorLocker ml(monitor_); shutting_down_ = true;