VM: Service isolate under precompilation.

runtime/bin/vmservice_impl.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 "bin/vmservice_impl.h"
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 13 matching lines @@
 
 #define SHUTDOWN_ON_ERROR(handle)                               \
   if (Dart_IsError(handle)) {                                   \
     error_msg_ = strdup(Dart_GetError(handle));                 \
     Dart_ExitScope();                                           \
     Dart_ShutdownIsolate();                                     \
     return false;                                               \
   }
 
 #define kLibrarySourceNamePrefix "/vmservice"
+static const char* kVMServiceIOLibraryUri = "dart:vmservice_io";
 static const char* kVMServiceIOLibraryScriptResourceName = "vmservice_io.dart";
 
 struct ResourcesEntry {
   const char* path_;
   const char* resource_;
   int length_;
 };
 
 extern ResourcesEntry __service_bin_resources_[];
 
@@ skipping 109 matching lines @@
   }
   return NULL;
 }
 
 
 const char* VmService::error_msg_ = NULL;
 char VmService::server_ip_[kServerIpStringBufferSize];
 intptr_t VmService::server_port_ = 0;
 
 
-bool VmService::Setup(const char* server_ip, intptr_t server_port) {
+bool VmService::LoadForGenPrecompiled() {
+  Dart_Handle result;
+  Dart_SetLibraryTagHandler(LibraryTagHandler);
+  Dart_Handle library = LoadLibrary(kVMServiceIOLibraryScriptResourceName);
+  ASSERT(library != Dart_Null());
+  SHUTDOWN_ON_ERROR(library);
+  result = Dart_SetNativeResolver(library, VmServiceIONativeResolver, NULL);
+  SHUTDOWN_ON_ERROR(result);
+  result = Dart_FinalizeLoading(false);
+  SHUTDOWN_ON_ERROR(result);
+  return true;
+}
+
+
+bool VmService::Setup(const char* server_ip,
+                      intptr_t server_port,
+                      bool running_precompiled) {
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   SetServerIPAndPort("", 0);
 
   Dart_Handle result;
 
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   SHUTDOWN_ON_ERROR(builtin_lib);
 
   // Prepare for script loading by setting up the 'print' and 'timer'
   // closures and setting up 'package root' for URI resolution.
   result = DartUtils::PrepareForScriptLoading(
       NULL, NULL, NULL, true, false, builtin_lib);
   SHUTDOWN_ON_ERROR(result);
 
-  // Load main script.
-  Dart_SetLibraryTagHandler(LibraryTagHandler);
-  Dart_Handle library = LoadScript(kVMServiceIOLibraryScriptResourceName);
-  ASSERT(library != Dart_Null());
-  SHUTDOWN_ON_ERROR(library);
-  result = Dart_SetNativeResolver(library, VmServiceIONativeResolver, NULL);
-  SHUTDOWN_ON_ERROR(result);
-  result = Dart_FinalizeLoading(false);
-  SHUTDOWN_ON_ERROR(result);
+  if (running_precompiled) {
+    Dart_Handle url = DartUtils::NewString(kVMServiceIOLibraryUri);
+    Dart_Handle library = Dart_LookupLibrary(url);
+    SHUTDOWN_ON_ERROR(library);
+    result = Dart_SetRootLibrary(library);
+    SHUTDOWN_ON_ERROR(library);
+    result = Dart_SetNativeResolver(library, VmServiceIONativeResolver, NULL);
+    SHUTDOWN_ON_ERROR(result);
+  } else {
+    // Load main script.
+    Dart_SetLibraryTagHandler(LibraryTagHandler);
+    Dart_Handle library = LoadScript(kVMServiceIOLibraryScriptResourceName);
+    ASSERT(library != Dart_Null());
+    SHUTDOWN_ON_ERROR(library);
+    result = Dart_SetNativeResolver(library, VmServiceIONativeResolver, NULL);
+    SHUTDOWN_ON_ERROR(result);
+    result = Dart_FinalizeLoading(false);
+    SHUTDOWN_ON_ERROR(result);
+  }
 
   // Make runnable.
   Dart_ExitScope();
   Dart_ExitIsolate();
   bool retval = Dart_IsolateMakeRunnable(isolate);
   if (!retval) {
     Dart_EnterIsolate(isolate);
     Dart_ShutdownIsolate();
     error_msg_ = "Invalid isolate state - Unable to make it runnable.";
     return false;
   }
   Dart_EnterIsolate(isolate);
   Dart_EnterScope();
 
-  library = Dart_RootLibrary();
+  Dart_Handle library = Dart_RootLibrary();
   SHUTDOWN_ON_ERROR(library);
 
   // Set HTTP server state.
   result = DartUtils::SetStringField(library, "_ip", server_ip);
   SHUTDOWN_ON_ERROR(result);
   // If we have a port specified, start the server immediately.
   bool auto_start = server_port >= 0;
   if (server_port < 0) {
     // Adjust server_port to port 0 which will result in the first available
     // port when the HTTP server is started.
@@ skipping 58 matching lines @@
   int r = Resources::ResourceLookup(buffer, &vmservice_source);
   if (r == Resources::kNoSuchInstance) {
     FATAL1("vm-service: Could not find embedded source file: %s ", buffer);
   }
   ASSERT(r != Resources::kNoSuchInstance);
   return Dart_NewStringFromCString(vmservice_source);
 }
 
 
 Dart_Handle VmService::LoadScript(const char* name) {
-  Dart_Handle url = Dart_NewStringFromCString("dart:vmservice_io");
+  Dart_Handle uri = Dart_NewStringFromCString(kVMServiceIOLibraryUri);
   Dart_Handle source = GetSource(name);
-  return Dart_LoadScript(url, source, 0, 0);
+  return Dart_LoadScript(uri, source, 0, 0);
+}
+
+
+Dart_Handle VmService::LoadLibrary(const char* name) {
+  Dart_Handle uri = Dart_NewStringFromCString(kVMServiceIOLibraryUri);
+  Dart_Handle source = GetSource(name);
+  return Dart_LoadLibrary(uri, source, 0, 0);
 }
 
 
 Dart_Handle VmService::LoadSource(Dart_Handle library, const char* name) {
-  Dart_Handle url = Dart_NewStringFromCString(name);
+  Dart_Handle uri = Dart_NewStringFromCString(name);
   Dart_Handle source = GetSource(name);
-  return Dart_LoadSource(library, url, source, 0, 0);
+  return Dart_LoadSource(library, uri, source, 0, 0);
 }
 
 
 Dart_Handle VmService::LoadResource(Dart_Handle library,
                                     const char* resource_name) {
   // Prepare for invoke call.
   Dart_Handle name = Dart_NewStringFromCString(resource_name);
   RETURN_ERROR_HANDLE(name);
   const char* data_buffer = NULL;
   int data_buffer_length = Resources::ResourceLookup(resource_name,
@@ skipping 79 matching lines @@
   Dart_Handle source = GetSource(url_string);
   if (Dart_IsError(source)) {
     return source;
   }
   return Dart_LoadSource(library, url, source, 0, 0);
 }
 
 
 }  // namespace bin
 }  // namespace dart