- Implement package map parameter when spawning isolate.

BUG=
[email protected]

Review URL: https://codereview.chromium.org/1403693002 .

Author: iposva-google

runtime/bin/builtin.dart

@@ -514,6 +514,34 @@ void _loadPackagesMap(String packagesParam) {
 }
 
 
+// Embedder Entrypoint:
+// Add mapping from package name to URI.
+void _addPackageMapEntry(String key, String value) {
+  if (!_setupCompleted) {
+    _setupHooks();
+  }
+  if (_traceLoading) {
+    _log("Adding packages map entry: $key -> $value");
+  }
+  if (_packageRoot != null) {
+    if (_traceLoading) {
+      _log("_packageRoot already set: $_packageRoot");
+    }
+    throw "Cannot add package map entry to an exisiting package root.";
+  }
+  if (_packagesPort != null) {
+    if (_traceLoading) {
+      _log("Package map load request already pending.");
+    }
+    throw "Cannot add package map entry during package map resolution.";
+  }
+  if (_packageMap == null) {
+    _packageMap = new Map<String, Uri>();
+  }
+  _packageMap[key] = _workingDirectory.resolve(value);
+}
+
+
 void _asyncLoadError(_LoadRequest req, _LoadError error, StackTrace stack) {
   if (_traceLoading) {
     _log("_asyncLoadError(${req._uri}), error: $error\nstack: $stack");

runtime/bin/dartutils.cc

@@ -637,6 +637,7 @@ Dart_Handle DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
                                              bool is_service_isolate,
                                              bool trace_loading,
                                              const char* package_root,
+                                             const char** package_map,
                                              const char* packages_file) {
   // Setup the internal library's 'internalPrint' function.
   Dart_Handle print = Dart_Invoke(
@@ -670,6 +671,7 @@ Dart_Handle DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
 
   // Set up package root if specified.
   if (package_root != NULL) {
+    ASSERT(package_map == NULL);
     ASSERT(packages_file == NULL);
     result = NewString(package_root);
     RETURN_IF_ERROR(result);
@@ -681,6 +683,33 @@ Dart_Handle DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
                          kNumArgs,
                          dart_args);
     RETURN_IF_ERROR(result);
+  } else if (package_map != NULL) {
+    ASSERT(packages_file == NULL);
+    Dart_Handle func_name = NewString("_addPackageMapEntry");
+    RETURN_IF_ERROR(func_name);
+
+    for (int i = 0; package_map[i] != NULL; i +=2) {
+      const int kNumArgs = 2;
+      Dart_Handle dart_args[kNumArgs];
+      // Get the key.
+      result = NewString(package_map[i]);
+      RETURN_IF_ERROR(result);
+      dart_args[0] = result;
+      if (package_map[i + 1] == NULL) {
+        return Dart_NewUnhandledExceptionError(
+            NewDartArgumentError("Adding package map entry without value."));
+      }
+      // Get the value.
+      result = NewString(package_map[i + 1]);
+      RETURN_IF_ERROR(result);
+      dart_args[1] = result;
+      // Setup the next package map entry.
+      result = Dart_Invoke(builtin_lib,
+                           func_name,
+                           kNumArgs,
+                           dart_args);
+      RETURN_IF_ERROR(result);
+    }
   } else if (packages_file != NULL) {
     result = NewString(packages_file);
     RETURN_IF_ERROR(result);
@@ -738,6 +767,7 @@ Dart_Handle DartUtils::PrepareIsolateLibrary(Dart_Handle isolate_lib) {
 
 
 Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
+                                               const char** package_map,
                                                const char* packages_file,
                                                bool is_service_isolate,
                                                bool trace_loading,
@@ -772,6 +802,7 @@ Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
                                  is_service_isolate,
                                  trace_loading,
                                  package_root,
+                                 package_map,
                                  packages_file);
   RETURN_IF_ERROR(result);
 

runtime/bin/dartutils.h

@@ -129,6 +129,7 @@ class DartUtils {
                                            bool is_service_isolate,
                                            bool trace_loading,
                                            const char* package_root,
+                                           const char** package_map,
                                            const char* packages_file);
   static Dart_Handle PrepareCoreLibrary(Dart_Handle core_lib,
                                  Dart_Handle builtin_lib,
@@ -138,6 +139,7 @@ class DartUtils {
   static Dart_Handle PrepareIOLibrary(Dart_Handle io_lib);
   static Dart_Handle PrepareIsolateLibrary(Dart_Handle isolate_lib);
   static Dart_Handle PrepareForScriptLoading(const char* package_root,
+                                             const char** package_map,
                                              const char* packages_file,
                                              bool is_service_isolate,
                                              bool trace_loading,

runtime/bin/gen_snapshot.cc

@@ -593,6 +593,7 @@ int main(int argc, char** argv) {
     // closures and setting up 'package root' for URI resolution.
     result =
         DartUtils::PrepareForScriptLoading(package_root,
+                                           NULL,
                                            NULL,
                                            false,
                                            false,

runtime/bin/main.cc

@@ -706,6 +706,7 @@ static Dart_Handle EnvironmentCallback(Dart_Handle name) {
 static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
                                                 const char* main,
                                                 const char* package_root,
+                                                const char** package_map,
                                                 const char* packages_file,
                                                 Dart_IsolateFlags* flags,
                                                 char** error,
@@ -767,6 +768,7 @@ static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
   // 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,
                                               false,
                                               has_trace_loading,
@@ -815,13 +817,18 @@ static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
 static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
                                           const char* main,
                                           const char* package_root,
+                                          const char** package_map,
                                           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)) {
+    *error = strdup("Invalid arguments - Cannot simultaneously specify "
+                    "package root and package map.");
+    return NULL;
+  }
   IsolateData* parent_isolate_data = reinterpret_cast<IsolateData*>(data);
-  int exit_code = 0;
   if (script_uri == NULL) {
     if (data == NULL) {
       *error = strdup("Invalid 'callback_data' - Unable to spawn new isolate");
@@ -834,15 +841,20 @@ static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
     }
   }
   const char* packages_file = NULL;
-  if (package_root == 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,
                                      flags,
                                      error,
@@ -1116,6 +1128,7 @@ bool RunMainIsolate(const char* script_name,
   Dart_Isolate isolate = CreateIsolateAndSetupHelper(script_name,
                                                      "main",
                                                      commandline_package_root,
+                                                     NULL,
                                                      commandline_packages_file,
                                                      NULL,
                                                      &error,

runtime/bin/vmservice_dartium.cc

@@ -65,7 +65,7 @@ Dart_Isolate VmServiceServer::CreateIsolate(const uint8_t* snapshot_buffer) {
   // 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, true, false, builtin_lib);
+      NULL, NULL, NULL, true, false, builtin_lib);
   CHECK_RESULT(result);
 
   ASSERT(Dart_IsServiceIsolate(isolate));

runtime/bin/vmservice_impl.cc

@@ -174,7 +174,7 @@ bool VmService::Setup(const char* server_ip, intptr_t server_port) {
   // 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, true, false, builtin_lib);
+      NULL, NULL, NULL, true, false, builtin_lib);
   SHUTDOWN_ON_ERROR(result);
 
   // Load main script.

runtime/include/dart_api.h

@@ -755,8 +755,14 @@ typedef struct {
  *   improve debugging messages.  The main function is not invoked by
  *   this function.
  * \param package_root The package root path for this isolate to resolve
- *   package imports against. If this parameter is NULL, the package root path
- *   of the parent isolate should be used.
+ *   package imports against. Only one of package_root and package_map
+ *   parameters is non-NULL. If neither parameter is passed the package
+ *   resolution of the parent isolate should be used.
+ * \param package_map The package map for this isolate to resolve package
+ *   imports against. The array contains alternating keys and values,
+ *   terminated by a NULL key. Only one of package_root and package_map
+ *   parameters is non-NULL. If neither parameter is passed the package
+ *   resolution of the parent isolate should be used.
  * \param flags Default flags for this isolate being spawned. Either inherited
  *   from the spawning isolate or passed as parameters when spawning the
  *   isolate from Dart code.
@@ -771,6 +777,7 @@ typedef struct {
 typedef Dart_Isolate (*Dart_IsolateCreateCallback)(const char* script_uri,
                                                    const char* main,
                                                    const char* package_root,
+                                                   const char** package_map,
                                                    Dart_IsolateFlags* flags,
                                                    void* callback_data,
                                                    char** error);