- reorganize DartUtils::PrepareForScriptLoading so that it does not have the wait for service load …

runtime/bin/gen_snapshot.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.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 238 matching lines @@
 
 static Dart_Handle ResolveUriInWorkingDirectory(const char* script_uri) {
   bool failed = false;
   char* result_string = NULL;
 
   {
     UriResolverIsolateScope scope;
 
     // Run DartUtils::ResolveUriInWorkingDirectory in context of uri resolver
     // isolate.
-    Dart_Handle builtin_lib =
-        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-    CHECK_RESULT(builtin_lib);
-
     Dart_Handle result = DartUtils::ResolveUriInWorkingDirectory(
-        DartUtils::NewString(script_uri), builtin_lib);
+        DartUtils::NewString(script_uri));
     if (Dart_IsError(result)) {
       failed = true;
       result_string = strdup(Dart_GetError(result));
     } else {
       result_string = strdup(DartUtils::GetStringValue(result));
     }
   }
 
   Dart_Handle result = failed ? Dart_NewApiError(result_string) :
                                 DartUtils::NewString(result_string);
   free(result_string);
   return result;
 }
 
 
 static Dart_Handle FilePathFromUri(const char* script_uri) {
   bool failed = false;
   char* result_string = NULL;
 
   {
     UriResolverIsolateScope scope;
 
     // Run DartUtils::FilePathFromUri in context of uri resolver isolate.
-    Dart_Handle builtin_lib =
-        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-    CHECK_RESULT(builtin_lib);
-
     Dart_Handle result = DartUtils::FilePathFromUri(
-        DartUtils::NewString(script_uri), builtin_lib);
+        DartUtils::NewString(script_uri));
     if (Dart_IsError(result)) {
       failed = true;
       result_string = strdup(Dart_GetError(result));
     } else {
       result_string = strdup(DartUtils::GetStringValue(result));
     }
   }
 
   Dart_Handle result = failed ? Dart_NewApiError(result_string) :
                                 DartUtils::NewString(result_string);
   free(result_string);
   return result;
 }
 
 
 static Dart_Handle ResolveUri(const char* library_uri, const char* uri) {
   bool failed = false;
   char* result_string = NULL;
 
   {
     UriResolverIsolateScope scope;
 
     // Run DartUtils::ResolveUri in context of uri resolver isolate.
-    Dart_Handle builtin_lib =
-        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-    CHECK_RESULT(builtin_lib);
-
     Dart_Handle result = DartUtils::ResolveUri(
-        DartUtils::NewString(library_uri),
-        DartUtils::NewString(uri),
-        builtin_lib);
+        DartUtils::NewString(library_uri), DartUtils::NewString(uri));
     if (Dart_IsError(result)) {
       failed = true;
       result_string = strdup(Dart_GetError(result));
     } else {
       result_string = strdup(DartUtils::GetStringValue(result));
     }
   }
 
   Dart_Handle result = failed ? Dart_NewApiError(result_string) :
                                 DartUtils::NewString(result_string);
@@ skipping 617 matching lines @@
 }
 
 
 static Dart_Isolate CreateServiceIsolate(const char* script_uri,
                                          const char* main,
                                          const char* package_root,
                                          const char* package_config,
                                          Dart_IsolateFlags* flags,
                                          void* data,
                                          char** error) {
+  IsolateData* isolate_data = new IsolateData(script_uri,
+                                              package_root,
+                                              package_config);
   Dart_Isolate isolate = NULL;
   isolate = Dart_CreateIsolate(script_uri,
                                main,
                                NULL,
                                NULL,
-                               NULL,
+                               isolate_data,
                                error);
 
   if (isolate == NULL) {
     Log::PrintErr("Error: Could not create service isolate");
     return NULL;
   }
 
   Dart_EnterScope();
   if (!Dart_IsServiceIsolate(isolate)) {
     Log::PrintErr("Error: We only expect to create the service isolate");
@@ skipping 73 matching lines @@
       DartUtils::WriteFile,
       DartUtils::CloseFile,
       DartUtils::EntropySource,
       NULL);
   if (error != NULL) {
     Log::PrintErr("VM initialization failed: %s\n", error);
     free(error);
     return 255;
   }
 
+  IsolateData* isolate_data = new IsolateData(NULL, NULL, NULL);
   Dart_Isolate isolate = Dart_CreateIsolate(
-      NULL, NULL, NULL, NULL, NULL, &error);
+      NULL, NULL, NULL, NULL, isolate_data, &error);
   if (isolate == NULL) {
     Log::PrintErr("Error: %s", error);
     free(error);
     exit(255);
   }
 
   Dart_Handle result;
   Dart_Handle library;
   Dart_EnterScope();
 
   ASSERT(vm_isolate_snapshot_filename != NULL);
   ASSERT(isolate_snapshot_filename != NULL);
   // Load up the script before a snapshot is created.
   if (app_script_name != NULL) {
     // This is the case of a custom embedder (e.g: dartium) trying to
     // create a full snapshot. The current isolate is set up so that we can
     // invoke the dart uri resolution code like _resolveURI. App script is
     // loaded into a separate isolate.
 
     SetupForUriResolution();
 
-    // Get handle to builtin library.
-    Dart_Handle builtin_lib =
-        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-    CHECK_RESULT(builtin_lib);
-
-    // Ensure that we mark all libraries as loaded.
-    result = Dart_FinalizeLoading(false);
+    // Prepare builtin and its dependent libraries for use to resolve URIs.
+    // Set up various closures, e.g: printing, timers etc.
+    // Set up 'package root' for URI resolution.
+    result = DartUtils::PrepareForScriptLoading(false, false);
     CHECK_RESULT(result);
 
-    // Prepare for script loading by setting up the 'print' and 'timer'
-    // closures and setting up 'package root' for URI resolution.
-    result =
-        DartUtils::PrepareForScriptLoading(package_root,
-                                           NULL,
-                                           false,
-                                           false,
-                                           builtin_lib);
+    // Set up the load port provided by the service isolate so that we can
+    // load scripts.
+    result = DartUtils::SetupServiceLoadPort();
     CHECK_RESULT(result);
+
+    // Setup package root if specified.
+    result = DartUtils::SetupPackageRoot(package_root, NULL);
+    CHECK_RESULT(result);
+
     Dart_ExitScope();
     Dart_ExitIsolate();
 
     UriResolverIsolateScope::isolate = isolate;
 
     // Now we create an isolate into which we load all the code that needs to
     // be in the snapshot.
-    if (Dart_CreateIsolate(NULL, NULL, NULL, NULL, NULL, &error) == NULL) {
+    isolate_data = new IsolateData(NULL, NULL, NULL);
+    if (Dart_CreateIsolate(
+            NULL, NULL, NULL, NULL, isolate_data, &error) == NULL) {
       fprintf(stderr, "%s", error);
       free(error);
       exit(255);
     }
     Dart_EnterScope();
 
     // Set up the library tag handler in such a manner that it will use the
     // URL mapping specified on the command line to load the libraries.
     result = Dart_SetLibraryTagHandler(CreateSnapshotLibraryTagHandler);
     CHECK_RESULT(result);
@@ skipping 31 matching lines @@
   EventHandler::Stop();
   return 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }