Add package config support to dart:isolate

runtime/bin/main.cc

 // Copyright (c) 2012, 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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_tools_api.h"
@@ skipping 686 matching lines @@
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
     return NULL;                                                               \
   }                                                                            \
 
 
 // Returns true on success, false on failure.
 static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
                                                 const char* main,
                                                 const char* package_root,
-                                                const char** package_map,
                                                 const char* packages_file,

[rmacnak, 2016/01/13 01:38:59]

packages_file -> package_config

[Ivan Posva, 2016/01/13 02:13:15]

Done.

                                                 Dart_IsolateFlags* flags,
                                                 char** error,
                                                 int* exit_code) {
   ASSERT(script_uri != NULL);
   IsolateData* isolate_data = new IsolateData(script_uri,
                                               package_root,
                                               packages_file);
   Dart_Isolate isolate = NULL;
 
   isolate = Dart_CreateIsolate(script_uri,
@@ skipping 42 matching lines @@
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   // The builtin library is part of the core snapshot and would already be
   // available here in the case of script snapshot loading.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   CHECK_RESULT(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(package_root,
-                                              package_map,
                                               packages_file,

[rmacnak, 2016/01/13 01:38:59]

packages_file -> package_config

[Ivan Posva, 2016/01/13 02:13:15]

Done.

                                               false,
                                               has_trace_loading,
                                               builtin_lib);
   CHECK_RESULT(result);
 
   result = Dart_SetEnvironmentCallback(EnvironmentCallback);
   CHECK_RESULT(result);
 
   if (!has_run_precompiled_snapshot) {
     // Load the script.
@@ skipping 25 matching lines @@
 
   return isolate;
 }
 
 #undef CHECK_RESULT
 
 
 static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
                                           const char* main,
                                           const char* package_root,
-                                          const char** package_map,
+                                          const char* package_config,
                                           Dart_IsolateFlags* flags,
                                           void* data, char** error) {
   // The VM should never call the isolate helper with a NULL flags.
   ASSERT(flags != NULL);
   ASSERT(flags->version == DART_FLAGS_CURRENT_VERSION);
-  if ((package_root != NULL) && (package_map != NULL)) {
+  if ((package_root != NULL) && (package_config != NULL)) {
     *error = strdup("Invalid arguments - Cannot simultaneously specify "
                     "package root and package map.");
     return NULL;
   }
-  IsolateData* parent_isolate_data = reinterpret_cast<IsolateData*>(data);
-  if (script_uri == NULL) {
-    if (data == NULL) {
-      *error = strdup("Invalid 'callback_data' - Unable to spawn new isolate");
-      return NULL;
-    }
-    script_uri = parent_isolate_data->script_url;
-    if (script_uri == NULL) {
-      *error = strdup("Invalid 'callback_data' - Unable to spawn new isolate");
-      return NULL;
-    }
-  }
-  const char* packages_file = NULL;
-  // If neither a package root nor a package map are requested pass on the
-  // inherited values.
-  if ((package_root == NULL) && (package_map == NULL)) {
-    if (parent_isolate_data != NULL) {
-      package_root = parent_isolate_data->package_root;
-      packages_file = parent_isolate_data->packages_file;
-    }
-  }
 
   int exit_code = 0;
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      package_root,
-                                     package_map,
-                                     packages_file,
+                                     package_config,
                                      flags,
                                      error,
                                      &exit_code);
 }
 
 
 static void PrintVersion() {
   Log::PrintErr("Dart VM version: %s\n", Dart_VersionString());
 }
 
@@ skipping 292 matching lines @@
 bool RunMainIsolate(const char* script_name,
                     CommandLineOptions* dart_options) {
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
   int exit_code = 0;
   char* isolate_name = BuildIsolateName(script_name, "main");
   Dart_Isolate isolate = CreateIsolateAndSetupHelper(script_name,
                                                      "main",
                                                      commandline_package_root,
-                                                     NULL,
                                                      commandline_packages_file,
                                                      NULL,
                                                      &error,
                                                      &exit_code);
   if (isolate == NULL) {
     delete [] isolate_name;
     if (exit_code == kRestartRequestExitCode) {
       free(error);
       return true;
     }
@@ skipping 50 matching lines @@
     }
 
     if (has_noopt || has_gen_precompiled_snapshot) {
       Dart_QualifiedFunctionName standalone_entry_points[] = {
         { "dart:_builtin", "::", "_getMainClosure" },
         { "dart:_builtin", "::", "_getPrintClosure" },
         { "dart:_builtin", "::", "_getUriBaseClosure" },
         { "dart:_builtin", "::", "_resolveUri" },
         { "dart:_builtin", "::", "_setWorkingDirectory" },
         { "dart:_builtin", "::", "_setPackageRoot" },
-        { "dart:_builtin", "::", "_addPackageMapEntry" },
         { "dart:_builtin", "::", "_loadPackagesMap" },
         { "dart:_builtin", "::", "_loadDataAsync" },
         { "dart:io", "::", "_makeUint8ListView" },
         { "dart:io", "::", "_makeDatagram" },
         { "dart:io", "::", "_setupHooks" },
         { "dart:io", "::", "_getWatchSignalInternal" },
         { "dart:io", "CertificateException", "CertificateException." },
         { "dart:io", "Directory", "Directory." },
         { "dart:io", "File", "File." },
         { "dart:io", "FileSystemException", "FileSystemException." },
@@ skipping 306 matching lines @@
   Platform::Exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }