HTTP loading tests and package root support

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 "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 383 matching lines @@
   ASSERT(port_int != NULL);
   ASSERT(path_str != NULL);
   Dart_Handle result;
   Dart_Handle uri = DartUtils::NewString(script_uri);
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   Dart_Handle path = DartUtils::PathFromUri(uri, builtin_lib);
   if (Dart_IsError(path)) {
     return path;
   }
-  Dart_Handle host = DartUtils::DomainFromUri(uri, builtin_lib);
+  Dart_Handle host = DartUtils::HostFromUri(uri, builtin_lib);
   if (Dart_IsError(host)) {
     return host;
   }
   Dart_Handle port = DartUtils::PortFromUri(uri, builtin_lib);
   if (Dart_IsError(port)) {
     return port;
   }

[siva, 2013/05/31 20:36:29]

We seem to parse the URI 3 times here once to extract the path,
once for the host and finally for the port.

Not sure if it would be more efficient to parse once and then
just do GetFields on the parsed uri object.

[Cutch, 2013/05/31 22:37:19]

Done.

   result = Dart_StringToCString(path, path_str);
   if (Dart_IsError(result)) {
     return result;
   }
   result = Dart_StringToCString(host, host_str);
   if (Dart_IsError(result)) {
     return result;
   }
   if (DartUtils::GetInt64Value(port, port_int) == false) {
     return Dart_Error("Invalid port");
@@ skipping 97 matching lines @@
   dart_args[0] = arg;
   return Dart_Invoke(lib, DartUtils::NewString(method), kNumArgs, dart_args);
 }
 
 Dart_Handle DartUtils::PathFromUri(Dart_Handle script_uri,
                                    Dart_Handle builtin_lib) {
   return SingleArgDart_Invoke(script_uri, builtin_lib, "_pathFromHttpUri");
 }
 
 
-Dart_Handle DartUtils::DomainFromUri(Dart_Handle script_uri,
-                                     Dart_Handle builtin_lib) {
-  return SingleArgDart_Invoke(script_uri, builtin_lib, "_domainFromHttpUri");
+Dart_Handle DartUtils::HostFromUri(Dart_Handle script_uri,
+                                   Dart_Handle builtin_lib) {
+  return SingleArgDart_Invoke(script_uri, builtin_lib, "_hostFromHttpUri");
 }
 
 
 Dart_Handle DartUtils::PortFromUri(Dart_Handle script_uri,
                                    Dart_Handle builtin_lib) {
   return SingleArgDart_Invoke(script_uri, builtin_lib, "_portFromHttpUri");
 }
 
 
 Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
@@ skipping 164 matching lines @@
     if (Dart_IsError(source)) {
       return source;
     }
     return Dart_LoadScript(uri, source, 0, 0);
   }
 }
 
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
-  if (DartUtils::IsHttpSchemeURL(script_uri)) {
-    return LoadScriptHttp(script_uri, builtin_lib);
-  }
   Dart_Handle resolved_script_uri;
+  // Always call ResolveScriptUri so that the base path is set.

[siva, 2013/05/31 20:36:29]

From the comment it is not clear which base path it is referring to?

Also it could be:

Dart_Handle resolved_script_uri = ResolveScriptUri(...);

[Cutch, 2013/05/31 22:37:19]

Done.

   resolved_script_uri = ResolveScriptUri(NewString(script_uri), builtin_lib);
   if (Dart_IsError(resolved_script_uri)) {
     return resolved_script_uri;
   }
+  // Handle http: requests separately.
+  if (DartUtils::IsHttpSchemeURL(script_uri)) {

[siva, 2013/05/31 20:36:29]

A NewString(script_uri) was done above and again inside
LoadScriptHttp we do a NewString(script_uri).

Can the signature of LoadScriptHttp be changed to
(Dart_Handle script_uri, Dart_Handle builtin_lib);

Ditto comment about the signature of ParseHttpUri a NewString
is done in LoadScriptHttp and another one is done inside
ParseHttpUri.

[Cutch, 2013/05/31 22:37:19]

Done.

+    return LoadScriptHttp(script_uri, builtin_lib);
+  }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
                                                        builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   const char* script_path_cstr;
   Dart_StringToCString(script_path, &script_path_cstr);
   const char* error_msg = NULL;
   intptr_t len;
   const uint8_t* text_buffer = ReadFileFully(script_path_cstr,
@@ skipping 369 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