Refactor native extension shared library lookup.

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 422 matching lines @@
   const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
   return Dart_Invoke(builtin_lib,
                      NewString("_filePathFromUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
+Dart_Handle DartUtils::ExtensionPathFromUri(Dart_Handle extension_uri,
+                                            Dart_Handle builtin_lib) {
+  const int kNumArgs = 1;
+  Dart_Handle dart_args[kNumArgs];
+  dart_args[0] = extension_uri;
+  return Dart_Invoke(builtin_lib,
+                     NewString("_extensionPathFromUri"),
+                     kNumArgs,
+                     dart_args);
+}
+
+
 Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
                                   Dart_Handle url,
                                   Dart_Handle builtin_lib) {
   const int kNumArgs = 2;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = library_url;
   dart_args[1] = url;
   return Dart_Invoke(
       builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
 }
@@ skipping 59 matching lines @@
   if (is_io_library) {
     if (tag == Dart_kSourceTag) {
       return Dart_LoadSource(
           library, url, Builtin::PartSource(Builtin::kIOLibrary, url_string));
     } else {
       ASSERT(tag == Dart_kImportTag);
       return NewError("Unable to import '%s' ", url_string);
     }
   }
 
-  // Handle 'import' or 'part' requests for all other URIs.
-  // Get the file path out of the url.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
-  Dart_Handle file_path = FilePathFromUri(url, builtin_lib);
-  if (Dart_IsError(file_path)) {
-    return file_path;
-  }
-  const char* final_path = NULL;
-  Dart_StringToCString(file_path, &final_path);
   if (DartUtils::IsDartExtensionSchemeURL(url_string)) {
+    // Load a native code shared library to use in a native extension
     if (tag != Dart_kImportTag) {
       return NewError("Dart extensions must use import: '%s'", url_string);
     }
-    return Extensions::LoadExtension(final_path, library);
+    Dart_Handle path_parts = DartUtils::ExtensionPathFromUri(url, builtin_lib);
+    if (Dart_IsError(path_parts)) {
+      return path_parts;
+    }
+    const char* extension_directory = NULL;
+    Dart_StringToCString(Dart_ListGetAt(path_parts, 0), &extension_directory);
+    const char* extension_filename = NULL;
+    Dart_StringToCString(Dart_ListGetAt(path_parts, 1), &extension_filename);
+    const char* extension_name = NULL;
+    Dart_StringToCString(Dart_ListGetAt(path_parts, 2), &extension_name);
+
+    return Extensions::LoadExtension(extension_directory,
+                                     extension_filename,
+                                     extension_name,
+                                     library);
+  } else {
+    // Handle 'import' or 'part' requests for all other URIs.
+    // Get the file path out of the url.
+    Dart_Handle file_path = DartUtils::FilePathFromUri(url, builtin_lib);
+    if (Dart_IsError(file_path)) {
+      return file_path;
+    }
+    const char* final_path = NULL;
+    Dart_StringToCString(file_path, &final_path);
+    result = DartUtils::LoadSource(NULL,
+                                   library,
+                                   url,
+                                   tag,
+                                   final_path);
+    return result;
   }
-  result = DartUtils::LoadSource(NULL,
-                                 library,
-                                 url,
-                                 tag,
-                                 final_path);
-  return result;
 }
 
 
 const uint8_t* DartUtils::SniffForMagicNumber(const uint8_t* text_buffer,
                                               intptr_t* buffer_len,
                                               bool* is_snapshot) {
   intptr_t len = sizeof(magic_number);
   for (intptr_t i = 0; i < len; i++) {
     if (text_buffer[i] != magic_number[i]) {
       *is_snapshot = false;
@@ skipping 528 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart