HTTP loading cleanups

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 225 matching lines @@
   bool bytes_written = file_stream->WriteFully(buffer, num_bytes);
   ASSERT(bytes_written);
 }
 
 
 void DartUtils::CloseFile(void* stream) {
   delete reinterpret_cast<File*>(stream);
 }
 
 
 static Dart_Handle SingleArgDart_Invoke(Dart_Handle arg, Dart_Handle lib,

[Ivan Posva, 2013/06/18 22:24:00]

Please fix the argument order. Maybe in a different CL.

[Cutch, 2013/06/18 22:28:22]

Done.

                                         const char* method) {
   const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = arg;
   return Dart_Invoke(lib, DartUtils::NewString(method), kNumArgs, dart_args);
 }
 
 
 // TODO(iposva): Allocate from the zone instead of leaking error string
 // here. On the other hand the binary is about the exit anyway.
 #define SET_ERROR_MSG(error_msg, format, ...)                                  \
   intptr_t len = snprintf(NULL, 0, format, __VA_ARGS__);                       \
   char *msg = reinterpret_cast<char*>(malloc(len + 1));                        \
   snprintf(msg, len + 1, format, __VA_ARGS__);                                 \
   *error_msg = msg
 
 
 Dart_Handle MakeHttpRequest(Dart_Handle uri, Dart_Handle builtin_lib,
                             uint8_t** buffer, intptr_t* buffer_len) {
   const intptr_t HttpResponseCodeOK = 200;
   ASSERT(buffer != NULL);
   ASSERT(buffer_len != NULL);
   ASSERT(!Dart_HasLivePorts());
   SingleArgDart_Invoke(uri, builtin_lib, "_makeHttpRequest");
   // Run until all ports to isolate are closed.
   Dart_Handle result = Dart_RunLoop();
   if (Dart_IsError(result)) {
     return result;
   }
-  intptr_t responseCode =
-    DartUtils::GetIntegerField(builtin_lib, "_httpRequestResponseCode");
+  result = Dart_Invoke(builtin_lib,
+                       DartUtils::NewString("_getHttpRequestResponseCode"),
+                       0,
+                       0);

[Ivan Posva, 2013/06/18 22:24:00]

NULL it is typed as a pointer.

[Cutch, 2013/06/18 22:28:22]

Done.

+  if (Dart_IsError(result)) {
+    return result;
+  }
+  intptr_t responseCode = DartUtils::GetIntegerValue(result);
   if (responseCode != HttpResponseCodeOK) {
     // Return error.
     Dart_Handle responseStatus =
-        Dart_GetField(builtin_lib,
-                      DartUtils::NewString("_httpRequestStatusString"));
+        Dart_Invoke(builtin_lib,
+                    DartUtils::NewString("_getHttpRequestStatusString"),
+                    0,
+                    0);

[Ivan Posva, 2013/06/18 22:24:00]

ditto.

[Cutch, 2013/06/18 22:28:22]

Done.

     if (Dart_IsError(responseStatus)) {
       return responseStatus;
     }
     if (Dart_IsNull(responseStatus)) {
       return Dart_Error("HTTP error.");
     }
     return Dart_Error(DartUtils::GetStringValue(responseStatus));
   }
   Dart_Handle response =
-    Dart_GetField(builtin_lib, DartUtils::NewString("_httpRequestResponse"));
+      Dart_Invoke(builtin_lib, DartUtils::NewString("_getHttpRequestResponse"),
+                  0, 0);

[Ivan Posva, 2013/06/18 22:24:00]

ditto.

[Cutch, 2013/06/18 22:28:22]

Done.

   if (Dart_IsError(response)) {
     return response;
   }
   if (Dart_IsString(response)) {
     // Received response as string.
     uint8_t* responseString = NULL;
     intptr_t responseStringLength;
     Dart_Handle r = Dart_StringToUTF8(response, &responseString,
                                       &responseStringLength);
     if (Dart_IsError(r)) {
@@ skipping 74 matching lines @@
   intptr_t len;
   const uint8_t* text_buffer = ReadFileFully(filename, &len, &error_msg);
   if (text_buffer == NULL) {
     return Dart_Error(error_msg);
   }
   Dart_Handle str = Dart_NewStringFromUTF8(text_buffer, len);
   return str;
 }
 
 
+Dart_Handle DartUtils::SetWorkingDirectory(Dart_Handle builtin_lib) {
+  Dart_Handle directory = NewString(original_working_directory);
+  return SingleArgDart_Invoke(directory, builtin_lib, "_setWorkingDirectory");
+}
+
+
 Dart_Handle DartUtils::ResolveScriptUri(Dart_Handle script_uri,
                                         Dart_Handle builtin_lib) {
-  const int kNumArgs = 3;
+  const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = NewString(original_working_directory);
-  dart_args[1] = script_uri;
-  dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
+  dart_args[0] = script_uri;
   return Dart_Invoke(builtin_lib,
                      NewString("_resolveScriptUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
 Dart_Handle DartUtils::FilePathFromUri(Dart_Handle script_uri,
                                        Dart_Handle builtin_lib) {
-  const int kNumArgs = 2;
+  const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
-  dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
   return Dart_Invoke(builtin_lib,
                      NewString("_filePathFromUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
 Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
                                   Dart_Handle url,
                                   Dart_Handle builtin_lib) {
@@ skipping 140 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) {
-  // Always call ResolveScriptUri because as a side effect it sets
-  // the script entry path which is used when automatically resolving
-  // package root.
   Dart_Handle 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)) {
     return LoadScriptHttp(resolved_script_uri, builtin_lib);
   }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
@@ skipping 60 matching lines @@
     return Dart_LoadSource(library, url, source);
   }
   return Dart_Error("wrong tag");
 }
 
 
 Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
                                                Dart_Handle builtin_lib) {
   // Setup the corelib 'print' function.
   Dart_Handle print = Dart_Invoke(
       builtin_lib, NewString("_getPrintClosure"), 0, 0);

[Ivan Posva, 2013/06/18 22:24:00]

ditto.

[Cutch, 2013/06/18 22:28:22]

Done.

   Dart_Handle corelib = Dart_LookupLibrary(NewString("dart:core"));
   Dart_Handle result = Dart_SetField(corelib,
                                      NewString("_printClosure"),
                                      print);
 
   // Setup the 'timer' factory.
   Dart_Handle url = NewString(kAsyncLibURL);
   DART_CHECK_VALID(url);
   Dart_Handle async_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(async_lib);
   Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
   Dart_Handle timer_closure =
       Dart_Invoke(io_lib, NewString("_getTimerFactoryClosure"), 0, NULL);
   Dart_Handle args[1];
   args[0] = timer_closure;
   DART_CHECK_VALID(Dart_Invoke(
       async_lib, NewString("_setTimerFactoryClosure"), 1, args));
 
+
+  if (IsWindowsHost()) {
+    // Set running on Windows flag.
+    result = Dart_Invoke(builtin_lib, NewString("_setWindows"), 0, 0);

[Ivan Posva, 2013/06/18 22:24:00]

ditto.

[Cutch, 2013/06/18 22:28:22]

Done.

+    if (Dart_IsError(result)) {
+      return result;
+    }
+  }
+
+  // Set current working directory.
+  result = SetWorkingDirectory(builtin_lib);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+
   // Set up package root if specified.
   if (package_root != NULL) {
     result = NewString(package_root);
     if (!Dart_IsError(result)) {
       const int kNumArgs = 1;
       Dart_Handle dart_args[kNumArgs];
       dart_args[0] = result;
       return Dart_Invoke(builtin_lib,
                          NewString("_setPackageRoot"),
                          kNumArgs,
@@ skipping 279 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