Dart: Lazy observatory asset loading. Option to disable the observatory.

mojo/dart/embedder/dart_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 334 matching lines @@
     result = PrepareBuiltinLibraries(package_root, script_uri);
     DART_CHECK_VALID(result);
 
     // Set the handle watcher's control handle in the spawning isolate.
     result = SetHandleWatcherControlHandle();
     DART_CHECK_VALID(result);
 
     // The VM is creating the service isolate.
     if (Dart_IsServiceIsolate(isolate)) {
       service_isolate_spawned_ = true;
-      const intptr_t port = SupportDartMojoIo() ? 0 : -1;
+      const intptr_t port =
+          (SupportDartMojoIo() && observatory_enabled_) ? 0 : -1;
       InitializeDartMojoIo();
       if (!VmService::Setup("127.0.0.1", port)) {
         *error = strdup(VmService::GetErrorMessage());
         return nullptr;
       }
       return isolate;
     }
 
     if ((script_uri == kHandleWatcherIsolateUri) ||
         (script_uri == kStopHandleWatcherIsolateUri)) {
@@ skipping 131 matching lines @@
   }
 }
 
 
 bool DartController::initialized_ = false;
 MojoHandle DartController::handle_watcher_producer_handle_ =
     MOJO_HANDLE_INVALID;
 bool DartController::service_isolate_running_ = false;
 bool DartController::service_isolate_spawned_ = false;
 bool DartController::strict_compilation_ = false;
+bool DartController::observatory_enabled_ = true;
 DartControllerServiceConnector* DartController::service_connector_ = nullptr;
 base::Lock DartController::lock_;
 
 bool DartController::SupportDartMojoIo() {
   return service_connector_ != nullptr;
 }
 
 void DartController::InitializeDartMojoIo() {
   Dart_Isolate current_isolate = Dart_CurrentIsolate();
   CHECK(current_isolate != nullptr);
@@ skipping 185 matching lines @@
 }
 
 static bool generateEntropy(uint8_t* buffer, intptr_t length) {
   base::RandBytes(reinterpret_cast<void*>(buffer), length);
   return true;
 }
 
 bool DartController::Initialize(
     DartControllerServiceConnector* service_connector,
     bool strict_compilation,
+    bool observatory_enabled,
     const char** extra_args,
     int extra_args_count) {
   service_connector_ = service_connector;
+  observatory_enabled_ = observatory_enabled;
   strict_compilation_ = strict_compilation;
   InitVmIfNeeded(generateEntropy, extra_args, extra_args_count);
   return true;
 }
 
 bool DartController::RunDartScript(const DartControllerConfig& config) {
   const bool strict = strict_compilation_ || config.strict_compilation;
   Dart_Isolate isolate = CreateIsolateHelper(config.application_data,
                                              strict,
                                              config.callbacks,
@@ skipping 20 matching lines @@
     return;
   }
   BlockForServiceIsolateLocked();
   Dart_Cleanup();
   service_isolate_running_ = false;
   initialized_ = false;
 }
 
 }  // namespace apps
 }  // namespace mojo