Per isolate package root.

runtime/lib/isolate.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 "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/lockers.h"
 #include "vm/longjump.h"
 #include "vm/message_handler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/resolver.h"
 #include "vm/snapshot.h"
 #include "vm/symbols.h"
+#include "vm/unicode.h"
 
 namespace dart {
 
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 DEFINE_NATIVE_ENTRY(CapabilityImpl_factory, 1) {
@@ skipping 103 matching lines @@
     *error = zone->PrintToString(
         "Unable to canonicalize uri '%s': no library tag handler found.",
         uri.ToCString());
   }
   return retval;
 }
 
 
 static bool CreateIsolate(Isolate* parent_isolate,
                           IsolateSpawnState* state,
+                          const char* package_root,
                           char** error) {
   Dart_IsolateCreateCallback callback = Isolate::CreateCallback();
   if (callback == NULL) {
     *error = strdup("Null callback specified for isolate creation\n");
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
 
   void* init_data = parent_isolate->init_callback_data();
   Isolate* child_isolate = reinterpret_cast<Isolate*>(
       (callback)(state->script_url(),
                  state->function_name(),
+                 package_root,
                  init_data,
                  error));
   if (child_isolate == NULL) {
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
   state->set_isolate(reinterpret_cast<Isolate*>(child_isolate));
 
   Isolate::SetCurrent(parent_isolate);
   return true;
 }
 
 
 static RawObject* Spawn(Isolate* parent_isolate,
-                        IsolateSpawnState* state) {
+                        IsolateSpawnState* state,
+                        const char* package_root) {
   // Create a new isolate.
   char* error = NULL;
-  if (!CreateIsolate(parent_isolate, state, &error)) {
+  if (!CreateIsolate(parent_isolate, state, package_root, &error)) {
     delete state;
     const String& msg = String::Handle(String::New(error));
     free(error);
     ThrowIsolateSpawnException(msg);
   }
 
   // Create a SendPort for the new isolate.
   Isolate* spawned_isolate = state->isolate();
   const SendPort& port = SendPort::Handle(
       SendPort::New(spawned_isolate->main_port()));
@@ skipping 15 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(2));
   if (closure.IsClosure()) {
     Function& func = Function::Handle();
     func = Closure::function(closure);
     if (func.IsImplicitClosureFunction() && func.is_static()) {
 #if defined(DEBUG)
       Context& ctx = Context::Handle();
       ctx = Closure::context(closure);
       ASSERT(ctx.num_variables() == 0);
 #endif
-      return Spawn(isolate, new IsolateSpawnState(port.Id(), func, message));
+      return Spawn(isolate,
+                   new IsolateSpawnState(port.Id(), func, message),
+                   NULL);

[turnidge, 2014/09/08 16:40:48]

Please add the package_root to IsolateSpawnState as a constructor argument
instead.  I have been moving all of the Spawn params inside this object in
preparation for initializing isolates in a separate thread.

[Anders Johnsen, 2014/09/09 06:45:44]

Done.

     }
   }
   const String& msg = String::Handle(String::New(
       "Isolate.spawn expects to be passed a static or top-level function"));
   Exceptions::ThrowArgumentError(msg);
   return Object::null();
 }
 
 
-DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 4) {
+DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 5) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, uri, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, args, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(3));
+  GET_NATIVE_ARGUMENT(String, package_root, arguments->NativeArgAt(4));
 
   // Canonicalize the uri with respect to the current isolate.
   char* error = NULL;
   char* canonical_uri = NULL;
   const Library& root_lib =
       Library::Handle(arguments->isolate()->object_store()->root_library());
   if (!CanonicalizeUri(arguments->isolate(), root_lib, uri,
                        &canonical_uri, &error)) {
     const String& msg = String::Handle(String::New(error));
     ThrowIsolateSpawnException(msg);
   }
 
-  return Spawn(isolate, new IsolateSpawnState(port.Id(), canonical_uri,
-                                              args, message));
+  char* utf8_package_root = NULL;
+  if (!package_root.IsNull()) {
+    const intptr_t len = Utf8::Length(package_root);
+    Zone* zone = isolate->current_zone();
+    utf8_package_root = zone->Alloc<char>(len + 1);
+    package_root.ToUTF8(reinterpret_cast<uint8_t*>(utf8_package_root), len);
+    utf8_package_root[len] = '\0';
+  }
+
+  return Spawn(isolate,
+               new IsolateSpawnState(port.Id(), canonical_uri, args, message),
+               utf8_package_root);

[turnidge, 2014/09/08 16:40:48]

Ditto above, please pass the package root via IsolateSpawnState.

[Anders Johnsen, 2014/09/09 06:45:43]

Done.

 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_sendOOB, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, msg, arguments->NativeArgAt(1));
 
   // Make sure to route this request to the isolate library OOB mesage handler.
   msg.SetAt(0, Smi::Handle(Smi::New(Message::kIsolateLibOOBMsg)));
 
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   writer.WriteMessage(msg);
 
   PortMap::PostMessage(new Message(port.Id(),
                                    data, writer.BytesWritten(),
                                    Message::kOOBPriority));
   return Object::null();
 }
 
 }  // namespace dart